Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

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

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

diff --cc lib/libzpool/kernel.c
index 7f6c37da0865406ac0b3c8b98d1a06bdc93a5d6c,fc2a87fdbf6722ca4d2836ec22027fa6d37ce1c7..db5d6350e2019f6a2eb5f3106c90a8c34ee8eecf
--- 1/lib/libzpool/kernel.c
--- 2/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@@ -322,9 -323,8 +322,9 @@@ vn_open(char *path, int x1, int flags, 
        int fd;
        vnode_t *vp;
        int old_umask;
-       char real_path[MAXPATHLEN];
+       char realpath[MAXPATHLEN];
        struct stat64 st;
 +      int err;
  
        /*
         * If we're accessing a real disk from userland, we need to use

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

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

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

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