1 files changed, 5 insertions, 2 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index dd2f13077be..6c6e2c46122 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -493,8 +493,11 @@ static int nfs_release_page(struct page *page, gfp_t gfp)
 
         dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page);
 
-        /* Only do I/O if gfp is a superset of GFP_KERNEL */
-        if (mapping && (gfp & GFP_KERNEL) == GFP_KERNEL) {
+        /* Only do I/O if gfp is a superset of GFP_KERNEL, and we're not
+         * doing this memory reclaim for a fs-related allocation.
+         */
+        if (mapping && (gfp & GFP_KERNEL) == GFP_KERNEL &&
+            !(current->flags & PF_FSTRANS)) {
                 int how = FLUSH_SYNC;
 
                 /* Don't let kswapd deadlock waiting for OOM RPC calls */