diff options
| author | Brian Behlendorf <[email protected]> | 2012-04-30 14:24:39 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-04-30 14:26:49 -0700 |
| commit | 710114089fd7032125b6a2c24b24483c90a87907 (patch) | |
| tree | c2e73d303d203bc51ef67117e272e0800883bba8 /module/zfs/zvol.c | |
| parent | 3462fa279c7e821e3afdb02bf687a779a82a38ee (diff) | |
Revert "Disable direct reclaim on zvols"
This reverts commit ce90208cf9e04df966429f115d8831371ea9afce. This
change was observed to cause problems when using a zvol to back a VM
under 2.6.32.59 kernels. This issue was filed as #710.
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #342
Issue #710
Diffstat (limited to 'module/zfs/zvol.c')
| -rw-r--r-- | module/zfs/zvol.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index 9dd9547e2..9b1313402 100644 --- a/module/zfs/zvol.c +++ b/module/zfs/zvol.c @@ -1390,14 +1390,8 @@ zvol_init(void) { int error; - /* - * The zvol taskqs are created with TASKQ_NORECLAIM so they may be - * used safely as a swap device. If direct reclaim is allowed then - * they quickly deadlock in one of the internal memory allocations. - */ zvol_taskq = taskq_create(ZVOL_DRIVER, zvol_threads, maxclsyspri, - zvol_threads, INT_MAX, - TASKQ_PREPOPULATE | TASKQ_NORECLAIM); + zvol_threads, INT_MAX, TASKQ_PREPOPULATE); if (zvol_taskq == NULL) { printk(KERN_INFO "ZFS: taskq_create() failed\n"); return (-ENOMEM); |