Skip to content

Commit

Permalink
Revert Fix ASSERTION(!dsl_pool_sync_context(tx->tx_pool))
Browse files Browse the repository at this point in the history
Commit eec8164 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 <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #726
  • Loading branch information
ryao authored and behlendorf committed May 21, 2012
1 parent 48279ed commit 74636b3
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions module/zfs/txg.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,19 +372,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;
Expand Down

0 comments on commit 74636b3

Please sign in to comment.