Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 28 Mar 2017 20:39:24 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r316106 - head/sys/boot/zfs
Message-ID:  <201703282039.v2SKdONV074149@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ngie
Date: Tue Mar 28 20:39:24 2017
New Revision: 316106
URL: https://svnweb.freebsd.org/changeset/base/316106

Log:
  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.
  
  MFC after:	3 days
  Reported by:	amd64-gcc-6.3.0 (devel/amd64-xtoolchain-gcc)
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sys/boot/zfs/zfsimpl.c

Modified: head/sys/boot/zfs/zfsimpl.c
==============================================================================
--- head/sys/boot/zfs/zfsimpl.c	Tue Mar 28 20:34:02 2017	(r316105)
+++ head/sys/boot/zfs/zfsimpl.c	Tue Mar 28 20:39:24 2017	(r316106)
@@ -494,7 +494,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;
 
@@ -503,7 +503,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);
@@ -907,7 +907,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;
@@ -932,7 +932,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);
@@ -1060,7 +1060,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 {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703282039.v2SKdONV074149>