]> git.proxmox.com Git - mirror_spl-debian.git/commitdiff
Revert "Add TASKQ_NORECLAIM flag"
authorBrian Behlendorf <behlendorf1@llnl.gov>
Sat, 18 Aug 2012 17:56:17 +0000 (10:56 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 27 Aug 2012 19:00:42 +0000 (12:00 -0700)
This reverts commit 372c2572336468cbf60272aa7e735b7ca0c3807c.  The
use of the PF_MEMALLOC flag was always a hack to work around memory
reclaim deadlocks.  Those issues are believed to be resolved so this
workaround can be safely reverted.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
include/sys/taskq.h
module/spl/spl-taskq.c

index fec4de8caab6802cef6cb4190fefd9a24dcb68fa..a5d9492f25e05590d17dade2decfabe5823505f4 100644 (file)
@@ -40,7 +40,6 @@
 #define TASKQ_DYNAMIC           0x00000004
 #define TASKQ_THREADS_CPU_PCT   0x00000008
 #define TASKQ_DC_BATCH          0x00000010
-#define TASKQ_NORECLAIM         0x00000020
 
 typedef unsigned long taskqid_t;
 typedef void (task_func_t)(void *);
index 67a8345725d5352e4d51a4688fdccb4314127789..e4092b8422f4a5b7db307427d834282fd9e50bac 100644 (file)
@@ -442,10 +442,6 @@ taskq_thread(void *args)
        tq = tqt->tqt_tq;
         current->flags |= PF_NOFREEZE;
 
-       /* Disable the direct memory reclaim path */
-       if (tq->tq_flags & TASKQ_NORECLAIM)
-               current->flags |= PF_MEMALLOC;
-
         sigfillset(&blocked);
         sigprocmask(SIG_BLOCK, &blocked, NULL);
         flush_signals(current);