summaryrefslogtreecommitdiffstats
path: root/module/zcommon
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2008-12-17 13:01:56 -0800
committerBrian Behlendorf <[email protected]>2008-12-17 13:01:56 -0800
commitfafeacb53f6fdbcd0c23da460088a7bb97dc640b (patch)
tree6525fb4c796ec586c4ed05b2044f04ccb3f9ec58 /module/zcommon
parentda718dd80a89e1a1c43bd25d89841c4ab0eecfba (diff)
Resolve shadow conflict
Diffstat (limited to 'module/zcommon')
-rw-r--r--module/zcommon/zpool_prop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/module/zcommon/zpool_prop.c b/module/zcommon/zpool_prop.c
index f5efe18d2..562165b7a 100644
--- a/module/zcommon/zpool_prop.c
+++ b/module/zcommon/zpool_prop.c
@@ -152,16 +152,16 @@ zpool_prop_default_numeric(zpool_prop_t prop)
int
zpool_prop_string_to_index(zpool_prop_t prop, const char *string,
- uint64_t *index)
+ uint64_t *idx)
{
- return (zprop_string_to_index(prop, string, index, ZFS_TYPE_POOL));
+ return (zprop_string_to_index(prop, string, idx, ZFS_TYPE_POOL));
}
int
-zpool_prop_index_to_string(zpool_prop_t prop, uint64_t index,
+zpool_prop_index_to_string(zpool_prop_t prop, uint64_t idx,
const char **string)
{
- return (zprop_index_to_string(prop, index, string, ZFS_TYPE_POOL));
+ return (zprop_index_to_string(prop, idx, string, ZFS_TYPE_POOL));
}
#ifndef _KERNEL