Skip to contentSkip to conversation

NFS: Prevent another deadlock in nfs_release_page()

PATCH New Trond Myklebust 1 participant 1 message Mar 19, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 NFS: Prevent another deadlock in nfs_release_page()

From: Trond Myklebust <[email protected]>

We should not attempt to free the page if __GFP_FS is not set. Otherwise we can deadlock as per

http://bugzilla.kernel.org/show_bug.cgi?id=15578

---

 fs/nfs/file.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
fs/nfs/file.c +2 -1
index ae8d022..ae0d927 100644
@@ -491,7 +491,8 @@ static int nfs_release_page(struct page *page, gfp_t gfp)
 {
 	dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page);
 
-	if (gfp & __GFP_WAIT)
+	/* Only do I/O if gfp is a superset of GFP_KERNEL */
+	if ((gfp & GFP_KERNEL) == GFP_KERNEL)
 		nfs_wb_page(page->mapping->host, page);
 	/* If PagePrivate() is set, then the page is not freeable */
 	if (PagePrivate(page))