Create gcc-shadow branch

diff --git a/.topdeps b/.topdeps
new file mode 100644 (file)
index 0000000..1f7391f
--- /dev/null
+++ b/.topdeps
@@ -0,0 +1 @@
+master

diff --git a/.topmsg b/.topmsg
new file mode 100644 (file)
index 0000000..a4ccc94
--- /dev/null
+++ b/.topmsg
@@ -0,0 +1,6 @@
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Subject: [PATCH] gcc shadow
+
+Gcc -Wall warn: 'shadows a global declaration'
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
index a8005ffc0cf53a745ee788e537ad66c99a9db6b4..1f740057a7fd28ce5c07170f42fbb11fa2b75f9d 100644 (file)
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@ -528,14 +528,14 @@ zfs_close(zfs_handle_t *zhp)
 }
 
 int
-zfs_spa_version(zfs_handle_t *zhp, int *spa_version)
+zfs_spa_version(zfs_handle_t *zhp, int *version)
 {
        zpool_handle_t *zpool_handle = zhp->zpool_hdl;
 
        if (zpool_handle == NULL)
                return (-1);
 
-       *spa_version = zpool_get_prop_int(zpool_handle,
+       *version = zpool_get_prop_int(zpool_handle,
            ZPOOL_PROP_VERSION, NULL);
        return (0);
 }
@@ -546,12 +546,12 @@ zfs_spa_version(zfs_handle_t *zhp, int *spa_version)
 static int
 zfs_which_resv_prop(zfs_handle_t *zhp, zfs_prop_t *resv_prop)
 {
-       int spa_version;
+       int version;
 
-       if (zfs_spa_version(zhp, &spa_version) < 0)
+       if (zfs_spa_version(zhp, &version) < 0)
                return (-1);
 
-       if (spa_version >= SPA_VERSION_REFRESERVATION)
+       if (version >= SPA_VERSION_REFRESERVATION)
                *resv_prop = ZFS_PROP_REFRESERVATION;
        else
                *resv_prop = ZFS_PROP_RESERVATION;