Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis

diff --cc lib/libzfs/libzfs_dataset.c
Simple merge

diff --cc module/zfs/arc.c
Simple merge

diff --cc module/zfs/dnode.c
Simple merge

diff --cc module/zfs/spa.c
Simple merge

diff --cc module/zfs/vdev.c
Simple merge