X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Ftxg.c;fp=module%2Fzfs%2Ftxg.c;h=c234567d7e5295f6437f8b417f7b5d3c4c3ce130;hb=b876dac776afc8ea2c598eac53b9903de01c6172;hp=1cb3cb61c43abbc7cde92383d444303b66d5d7a8;hpb=f86373f5b2bac3e7cf17a766af5caa5bb7cf8c7a;p=zfs.git

diff --git a/module/zfs/txg.c b/module/zfs/txg.c
index 1cb3cb6..c234567 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;