From 710114089fd7032125b6a2c24b24483c90a87907 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 30 Apr 2012 14:24:39 -0700 Subject: [PATCH] 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 Signed-off-by: Brian Behlendorf Issue #342 Issue #710 --- module/zfs/zvol.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index 9dd9547e24..9b13134024 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);