c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert Fix ASSERTION(!dsl_pool_sync_context(tx->tx_pool))

Browse Source 
Commit eec8164771 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
This commit is contained in:
Richard Yao 2012-05-15 23:19:32 -04:00 committed by Brian Behlendorf
parent f86373f5b2
commit b876dac776
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
module/zfs/txg.c
View File

@ -382,19 +382,6 @@ txg_sync_thread(dsl_pool_t *dp)
callb_cpr_t cpr; callb_cpr_t cpr;
uint64_t start, delta; 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); txg_thread_enter(tx, &cpr);
start = delta = 0; start = delta = 0;