diff options
| author | ngie <ngie@FreeBSD.org> | 2017-03-31 04:51:08 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-03-31 04:51:08 +0000 |
| commit | c2fda5a08fb89e0411b68b21a801f37b349fec57 (patch) | |
| tree | 46f453ddfdb41c911a176f339211f2af899fbf86 | |
| parent | bac0773241434a62abcbd8db3cce6016d9a476a2 (diff) | |
| download | FreeBSD-src-c2fda5a08fb89e0411b68b21a801f37b349fec57.zip FreeBSD-src-c2fda5a08fb89e0411b68b21a801f37b349fec57.tar.gz | |
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.
| -rw-r--r-- | sys/boot/zfs/zfsimpl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/boot/zfs/zfsimpl.c b/sys/boot/zfs/zfsimpl.c index 9df5135..e34125c 100644 --- a/sys/boot/zfs/zfsimpl.c +++ b/sys/boot/zfs/zfsimpl.c @@ -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 *read) 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 *read_priv, spa_t **spap) * 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 *read_priv, spa_t **spap) */ 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 { |
