svn commit: r316106 - head/sys/boot/zfs

Roger Pau Monné roger.pau at citrix.com
Wed Mar 29 08:55:20 UTC 2017


On Tue, Mar 28, 2017 at 08:39:24PM +0000, Ngie Cooper wrote:
> 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)

Just a nit, but IMHO it would be clearer to use read_func, read_helper or some
more descriptive name since you where already changing this.

Roger.


More information about the svn-src-all mailing list