diff options
| author | Richard Yao <[email protected]> | 2012-05-15 23:19:32 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-08-27 12:01:37 -0700 |
| commit | b876dac776afc8ea2c598eac53b9903de01c6172 (patch) | |
| tree | b786b7cd63c241a74a1196ed1f984c1a4cd84ec4 /module/zfs/txg.c | |
| parent | f86373f5b2bac3e7cf17a766af5caa5bb7cf8c7a (diff) | |
Revert Fix ASSERTION(!dsl_pool_sync_context(tx->tx_pool))
Commit eec8164771bee067c3cd55ed0a16dadeeba276de worked around an issue
involving direct reclaim through the use of PF_MEMALLOC. Since we
are reworking thing to use KM_PUSHPAGE so that swap works, we revert
this patch in favor of the use of KM_PUSHPAGE in the affected areas.
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #726
Diffstat (limited to 'module/zfs/txg.c')
| -rw-r--r-- | module/zfs/txg.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/module/zfs/txg.c b/module/zfs/txg.c index 1cb3cb61c..c234567d7 100644 --- a/module/zfs/txg.c +++ b/module/zfs/txg.c @@ -382,19 +382,6 @@ txg_sync_thread(dsl_pool_t *dp) callb_cpr_t cpr; uint64_t start, delta; -#ifdef _KERNEL - /* - * Disable the normal reclaim path for the txg_sync thread. This - * ensures the thread will never enter dmu_tx_assign() which can - * otherwise occur due to direct reclaim. If this is allowed to - * happen the system can deadlock. Direct reclaim call path: - * - * ->shrink_icache_memory->prune_icache->dispose_list-> - * clear_inode->zpl_clear_inode->zfs_inactive->dmu_tx_assign - */ - current->flags |= PF_MEMALLOC; -#endif /* _KERNEL */ - txg_thread_enter(tx, &cpr); start = delta = 0; |