git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'condvar'
[zfs.git]
/
module
/
zfs
/
dmu.c
diff --git
a/module/zfs/dmu.c
b/module/zfs/dmu.c
index
9702d50
..
1d4d125
100644
(file)
--- a/
module/zfs/dmu.c
+++ b/
module/zfs/dmu.c
@@
-381,7
+381,7
@@
dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset, uint64_t length,
}
nblks = 1;
}
}
nblks = 1;
}
- dbp = kmem_zalloc(sizeof (dmu_buf_t *) * nblks, KM_
SLEEP
| KM_NODEBUG);
+ dbp = kmem_zalloc(sizeof (dmu_buf_t *) * nblks, KM_
PUSHPAGE
| KM_NODEBUG);
if (dn->dn_objset->os_dsl_dataset)
dp = dn->dn_objset->os_dsl_dataset->ds_dir->dd_pool;
if (dn->dn_objset->os_dsl_dataset)
dp = dn->dn_objset->os_dsl_dataset->ds_dir->dd_pool;
@@
-863,11
+863,11
@@
dmu_xuio_init(xuio_t *xuio, int nblk)
uio_t *uio = &xuio->xu_uio;
uio->uio_iovcnt = nblk;
uio_t *uio = &xuio->xu_uio;
uio->uio_iovcnt = nblk;
- uio->uio_iov = kmem_zalloc(nblk * sizeof (iovec_t), KM_
SLEEP
);
+ uio->uio_iov = kmem_zalloc(nblk * sizeof (iovec_t), KM_
PUSHPAGE
);
- priv = kmem_zalloc(sizeof (dmu_xuio_t), KM_
SLEEP
);
+ priv = kmem_zalloc(sizeof (dmu_xuio_t), KM_
PUSHPAGE
);
priv->cnt = nblk;
priv->cnt = nblk;
- priv->bufs = kmem_zalloc(nblk * sizeof (arc_buf_t *), KM_
SLEEP
);
+ priv->bufs = kmem_zalloc(nblk * sizeof (arc_buf_t *), KM_
PUSHPAGE
);
priv->iovp = uio->uio_iov;
XUIO_XUZC_PRIV(xuio) = priv;
priv->iovp = uio->uio_iov;
XUIO_XUZC_PRIV(xuio) = priv;
@@
-1431,7
+1431,7
@@
dmu_sync_late_arrival(zio_t *pio, objset_t *os, dmu_sync_cb_t *done, zgd_t *zgd,
return (EIO); /* Make zl_get_data do txg_waited_synced() */
}
return (EIO); /* Make zl_get_data do txg_waited_synced() */
}
- dsa = kmem_alloc(sizeof (dmu_sync_arg_t), KM_
SLEEP
);
+ dsa = kmem_alloc(sizeof (dmu_sync_arg_t), KM_
PUSHPAGE
);
dsa->dsa_dr = NULL;
dsa->dsa_done = done;
dsa->dsa_zgd = zgd;
dsa->dsa_dr = NULL;
dsa->dsa_done = done;
dsa->dsa_zgd = zgd;
@@
-1555,7
+1555,7
@@
dmu_sync(zio_t *pio, uint64_t txg, dmu_sync_cb_t *done, zgd_t *zgd)
dr->dt.dl.dr_override_state = DR_IN_DMU_SYNC;
mutex_exit(&db->db_mtx);
dr->dt.dl.dr_override_state = DR_IN_DMU_SYNC;
mutex_exit(&db->db_mtx);
- dsa = kmem_alloc(sizeof (dmu_sync_arg_t), KM_
SLEEP
);
+ dsa = kmem_alloc(sizeof (dmu_sync_arg_t), KM_
PUSHPAGE
);
dsa->dsa_dr = dr;
dsa->dsa_done = done;
dsa->dsa_zgd = zgd;
dsa->dsa_dr = dr;
dsa->dsa_done = done;
dsa->dsa_zgd = zgd;
@@
-1900,4
+1900,7
@@
EXPORT_SYMBOL(dmu_return_arcbuf);
EXPORT_SYMBOL(dmu_assign_arcbuf);
EXPORT_SYMBOL(dmu_buf_hold);
EXPORT_SYMBOL(dmu_ot);
EXPORT_SYMBOL(dmu_assign_arcbuf);
EXPORT_SYMBOL(dmu_buf_hold);
EXPORT_SYMBOL(dmu_ot);
+
+module_param(zfs_mdcomp_disable, int, 0644);
+MODULE_PARM_DESC(zfs_mdcomp_disable, "Disable meta data compression");
#endif
#endif