diff options
| author | Brian Behlendorf <[email protected]> | 2012-08-18 10:56:17 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-08-27 12:00:42 -0700 |
| commit | d47e664ad4b7468c43a97aa6d299d8756571155d (patch) | |
| tree | 7cfebbf48263810b5a751287c3d927dcd44f42c5 | |
| parent | e2dcc6e2b818d6f996203c9f1b4dfaf449554790 (diff) | |
Revert "Add TASKQ_NORECLAIM flag"
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 <[email protected]>
| -rw-r--r-- | include/sys/taskq.h | 1 | ||||
| -rw-r--r-- | module/spl/spl-taskq.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/sys/taskq.h b/include/sys/taskq.h index fec4de8ca..a5d9492f2 100644 --- a/include/sys/taskq.h +++ b/include/sys/taskq.h @@ -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 *); diff --git a/module/spl/spl-taskq.c b/module/spl/spl-taskq.c index 67a834572..e4092b842 100644 --- a/module/spl/spl-taskq.c +++ b/module/spl/spl-taskq.c @@ -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); |