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
Linux 3.6 compat, iops->create()
[zfs.git]
/
module
/
zfs
/
dsl_pool.c
diff --git
a/module/zfs/dsl_pool.c
b/module/zfs/dsl_pool.c
index
d428b7a
..
5341977
100644
(file)
--- a/
module/zfs/dsl_pool.c
+++ b/
module/zfs/dsl_pool.c
@@
-20,6
+20,7
@@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 by Delphix. All rights reserved.
*/
#include <sys/dsl_pool.h>
*/
#include <sys/dsl_pool.h>
@@
-291,7
+292,10
@@
static int
deadlist_enqueue_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
{
dsl_deadlist_t *dl = arg;
deadlist_enqueue_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
{
dsl_deadlist_t *dl = arg;
+ dsl_pool_t *dp = dmu_objset_pool(dl->dl_os);
+ rw_enter(&dp->dp_config_rwlock, RW_READER);
dsl_deadlist_insert(dl, bp, tx);
dsl_deadlist_insert(dl, bp, tx);
+ rw_exit(&dp->dp_config_rwlock);
return (0);
}
return (0);
}
@@
-858,17
+862,17
@@
module_param(zfs_write_limit_shift, int, 0444);
MODULE_PARM_DESC(zfs_write_limit_shift, "log2(fraction of memory) per txg");
module_param(zfs_txg_synctime_ms, int, 0644);
MODULE_PARM_DESC(zfs_write_limit_shift, "log2(fraction of memory) per txg");
module_param(zfs_txg_synctime_ms, int, 0644);
-MODULE_PARM_DESC(zfs_txg_synctime_ms, "Target milliseconds between t
gx
sync");
+MODULE_PARM_DESC(zfs_txg_synctime_ms, "Target milliseconds between t
xg
sync");
module_param(zfs_write_limit_min, ulong, 0444);
module_param(zfs_write_limit_min, ulong, 0444);
-MODULE_PARM_DESC(zfs_write_limit_min, "Min t
gx
write limit");
+MODULE_PARM_DESC(zfs_write_limit_min, "Min t
xg
write limit");
module_param(zfs_write_limit_max, ulong, 0444);
module_param(zfs_write_limit_max, ulong, 0444);
-MODULE_PARM_DESC(zfs_write_limit_max, "Max t
gx
write limit");
+MODULE_PARM_DESC(zfs_write_limit_max, "Max t
xg
write limit");
module_param(zfs_write_limit_inflated, ulong, 0444);
module_param(zfs_write_limit_inflated, ulong, 0444);
-MODULE_PARM_DESC(zfs_write_limit_inflated, "Inflated t
gx
write limit");
+MODULE_PARM_DESC(zfs_write_limit_inflated, "Inflated t
xg
write limit");
module_param(zfs_write_limit_override, ulong, 0444);
module_param(zfs_write_limit_override, ulong, 0444);
-MODULE_PARM_DESC(zfs_write_limit_override, "Override t
gx
write limit");
+MODULE_PARM_DESC(zfs_write_limit_override, "Override t
xg
write limit");
#endif
#endif