Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow

Conflicts:

	module/zfs/dmu.c

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

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

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

diff --cc module/zcommon/zfs_prop.c
Simple merge

diff --cc module/zcommon/zpool_prop.c
Simple merge

diff --cc module/zcommon/zprop_common.c
Simple merge

diff --cc module/zfs/dmu.c
index ea2bcb9402bbfaf22ef85590bacca34bc9880cd2,785c7c621611e69dd8e40d97c302f0de0b42018f..7a1a6cc3254715c674036104978261b5337cf1f2
--- 1/module/zfs/dmu.c
--- 2/module/zfs/dmu.c
+++ b/module/zfs/dmu.c
@@@ -180,8 -182,8 +182,8 @@@ dmu_bonus_hold(objset_t *os, uint64_t o
   * whose dnodes are in the same block.
   */
  static int
- dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset,
-     uint64_t length, int rd, void *tag, int *numbufsp, dmu_buf_t ***dbpp)
+ dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset, uint64_t length,
 -    int read, void *tag, int *numbufsp, dmu_buf_t ***dbpp, uint32_t flags)
++    int rd, void *tag, int *numbufsp, dmu_buf_t ***dbpp, uint32_t flags)
  {
        dsl_pool_t *dp = NULL;
        dmu_buf_t **dbp;
@@@ -231,9 -233,9 +233,9 @@@
                        return (EIO);
                }
                /* initiate async i/o */
 -              if (read) {
 +              if (rd) {
                        rw_exit(&dn->dn_struct_rwlock);
-                       (void) dbuf_read(db, zio, flags);
+                       (void) dbuf_read(db, zio, dbuf_flags);
                        rw_enter(&dn->dn_struct_rwlock, RW_READER);
                }
                dbp[i] = &db->db;
@@@ -284,8 -286,8 +286,8 @@@ dmu_buf_hold_array(objset_t *os, uint64
        if (err)
                return (err);
  
 -      err = dmu_buf_hold_array_by_dnode(dn, offset, length, read, tag,
 +      err = dmu_buf_hold_array_by_dnode(dn, offset, length, rd, tag,
-           numbufsp, dbpp);
+           numbufsp, dbpp, DMU_READ_PREFETCH);
  
        dnode_rele(dn, FTAG);
  
@@@ -299,8 -301,8 +301,8 @@@ dmu_buf_hold_array_by_bonus(dmu_buf_t *
        dnode_t *dn = ((dmu_buf_impl_t *)db)->db_dnode;
        int err;
  
 -      err = dmu_buf_hold_array_by_dnode(dn, offset, length, read, tag,
 +      err = dmu_buf_hold_array_by_dnode(dn, offset, length, rd, tag,
-           numbufsp, dbpp);
+           numbufsp, dbpp, DMU_READ_PREFETCH);
  
        return (err);
  }

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

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

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