Author: ngie
Date: Fri Mar 31 04:51:08 2017
New Revision: 316323
URL: https://svnweb.freebsd.org/changeset/base/316323
Log:
MFC r316106:
Don't shadow read(2) definition with `read` argument in vdev_{create,probe}
This fixes several -Wshadow warnings introduced in r192194, but now errors
with gcc 6.3.0.
Modified:
stable/10/sys/boot/zfs/zfsimpl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/boot/zfs/zfsimpl.c
==============================================================================
--- stable/10/sys/boot/zfs/zfsimpl.c Fri Mar 31 04:51:03 2017
(r316322)
+++ stable/10/sys/boot/zfs/zfsimpl.c Fri Mar 31 04:51:08 2017
(r316323)
@@ -488,7 +488,7 @@ vdev_find(uint64_t guid)
}
static vdev_t *
-vdev_create(uint64_t guid, vdev_read_t *read)
+vdev_create(uint64_t guid, vdev_read_t *_read)
{
vdev_t *vdev;
@@ -497,7 +497,7 @@ vdev_create(uint64_t guid, vdev_read_t *
STAILQ_INIT(&vdev->v_children);
vdev->v_guid = guid;
vdev->v_state = VDEV_STATE_OFFLINE;
- vdev->v_read = read;
+ vdev->v_read = _read;
vdev->v_phys_read = 0;
vdev->v_read_priv = 0;
STAILQ_INSERT_TAIL(&zfs_vdevs, vdev, v_alllink);
@@ -874,7 +874,7 @@ spa_all_status(void)
}
static int
-vdev_probe(vdev_phys_read_t *read, void *read_priv, spa_t **spap)
+vdev_probe(vdev_phys_read_t *_read, void *read_priv, spa_t **spap)
{
vdev_t vtmp;
vdev_phys_t *vdev_label = (vdev_phys_t *) zap_scratch;
@@ -899,7 +899,7 @@ vdev_probe(vdev_phys_read_t *read, void
* uberblock is most current.
*/
memset(&vtmp, 0, sizeof(vtmp));
- vtmp.v_phys_read = read;
+ vtmp.v_phys_read = _read;
vtmp.v_read_priv = read_priv;
off = offsetof(vdev_label_t, vl_vdev_phys);
BP_ZERO(&bp);
@@ -1025,7 +1025,7 @@ vdev_probe(vdev_phys_read_t *read, void
*/
vdev = vdev_find(guid);
if (vdev) {
- vdev->v_phys_read = read;
+ vdev->v_phys_read = _read;
vdev->v_read_priv = read_priv;
vdev->v_state = VDEV_STATE_HEALTHY;
} else {
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
