Resolve shadow conflict

diff --git a/module/zcommon/zprop_common.c b/module/zcommon/zprop_common.c
index bd267e2e61cace2adcba654a926925c6a0b1223f..83dc84039060267595fe93701cde27a90858c785 100644 (file)
--- a/module/zcommon/zprop_common.c
+++ b/module/zcommon/zprop_common.c
@@ -261,7 +261,7 @@ zprop_name_to_prop(const char *propname, zfs_type_t type)
 }
 
 int
-zprop_string_to_index(int prop, const char *string, uint64_t *index,
+zprop_string_to_index(int prop, const char *string, uint64_t *idx,
     zfs_type_t type)
 {
        zprop_desc_t *prop_tbl;
@@ -278,7 +278,7 @@ zprop_string_to_index(int prop, const char *string, uint64_t *index,
 
        for (i = 0; idx_tbl[i].pi_name != NULL; i++) {
                if (strcmp(string, idx_tbl[i].pi_name) == 0) {
-                       *index = idx_tbl[i].pi_value;
+                       *idx = idx_tbl[i].pi_value;
                        return (0);
                }
        }
@@ -287,7 +287,7 @@ zprop_string_to_index(int prop, const char *string, uint64_t *index,
 }
 
 int
-zprop_index_to_string(int prop, uint64_t index, const char **string,
+zprop_index_to_string(int prop, uint64_t idx, const char **string,
     zfs_type_t type)
 {
        zprop_desc_t *prop_tbl;
@@ -303,7 +303,7 @@ zprop_index_to_string(int prop, uint64_t index, const char **string,
                return (-1);
 
        for (i = 0; idx_tbl[i].pi_name != NULL; i++) {
-               if (idx_tbl[i].pi_value == index) {
+               if (idx_tbl[i].pi_value == idx) {
                        *string = idx_tbl[i].pi_name;
                        return (0);
                }