9p, afs, ceph, nfs: Use current_is_kswapd() rather than gfpflags_allow_blocking()

In 9p, afs ceph, and nfs, gfpflags_allow_blocking() (which wraps a
test for __GFP_DIRECT_RECLAIM being set) is used to determine if
->releasepage() should wait for the completion of a DIO write to fscache
with something like:

	if (folio_test_fscache(folio)) {
		if (!gfpflags_allow_blocking(gfp) || !(gfp & __GFP_FS))
			return false;
		folio_wait_fscache(folio);
	}

Instead, current_is_kswapd() should be used instead.

Note that this is based on a patch originally by Zhaoyang Huang[1].  In
addition to extending it to the other network filesystems and putting it on
top of my fscache rewrite, it also needs to include linux/swap.h in a bunch
of places.  Can current_is_kswapd() be moved to linux/mm.h?

Changes
=======
ver #5:
 - Dropping the changes for cifs.

Originally-signed-off-by: Zhaoyang Huang <[email protected]>
Co-developed-by: David Howells <[email protected]>
Signed-off-by: David Howells <[email protected]>
Reviewed-by: Jeff Layton <[email protected]>
cc: Zhaoyang Huang <[email protected]>
cc: Dominique Martinet <[email protected]>
cc: Marc Dionne <[email protected]>
cc: Steve French <[email protected]>
cc: Trond Myklebust <[email protected]>
cc: [email protected]
cc: [email protected]
cc: [email protected]
cc: [email protected]
cc: [email protected]
cc: [email protected]
cc: [email protected]
Link: https://lore.kernel.org/r/[email protected]/
Link: https://lore.kernel.org/r/164021590773.640689.16777975200823659231.stgit@warthog.procyon.org.uk/

diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index f3f349f460e5ea6959907bbe76a44f2a20fe5a96..c72e9f8f5f32582d6b1b958c41e4febb49ef316b 100644 (file)
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -16,6 +16,7 @@
 #include <linux/pagemap.h>
 #include <linux/idr.h>
 #include <linux/sched.h>
+#include <linux/swap.h>
 #include <linux/uio.h>
 #include <linux/netfs.h>
 #include <net/9p/9p.h>
@@ -143,7 +144,7 @@ static int v9fs_release_page(struct page *page, gfp_t gfp)
                return 0;
 #ifdef CONFIG_9P_FSCACHE
        if (folio_test_fscache(folio)) {
-               if (!gfpflags_allow_blocking(gfp) || !(gfp & __GFP_FS))
+               if (current_is_kswapd() || !(gfp & __GFP_FS))
                        return 0;
                folio_wait_fscache(folio);
        }

diff --git a/fs/afs/file.c b/fs/afs/file.c
index 572063dad0b3378643ea4b36afb0240a555f68f5..5b98db127a1b9abf81c42f11581a3084ff38275a 100644 (file)
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -14,6 +14,7 @@
 #include <linux/gfp.h>
 #include <linux/task_io_accounting_ops.h>
 #include <linux/mm.h>
+#include <linux/swap.h>
 #include <linux/netfs.h>
 #include "internal.h"
 
@@ -517,7 +518,7 @@ static int afs_releasepage(struct page *page, gfp_t gfp)
         * elected to wait */
 #ifdef CONFIG_AFS_FSCACHE
        if (folio_test_fscache(folio)) {
-               if (!gfpflags_allow_blocking(gfp) || !(gfp & __GFP_FS))
+               if (current_is_kswapd() || !(gfp & __GFP_FS))
                        return false;
                folio_wait_fscache(folio);
        }

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index e836f8f1d4f846545620c88f6fec190d10f05d78..b3d9459c9bbd61c1d9c76dec2a1a8f902994bf34 100644 (file)
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -4,6 +4,7 @@
 #include <linux/backing-dev.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
+#include <linux/swap.h>
 #include <linux/pagemap.h>
 #include <linux/slab.h>
 #include <linux/pagevec.h>
@@ -174,7 +175,7 @@ static int ceph_releasepage(struct page *page, gfp_t gfp)
                return 0;
 
        if (PageFsCache(page)) {
-               if (!gfpflags_allow_blocking(gfp) || !(gfp & __GFP_FS))
+               if (current_is_kswapd() || !(gfp & __GFP_FS))
                        return 0;
                wait_on_page_fscache(page);
        }

diff --git a/fs/nfs/fscache.h b/fs/nfs/fscache.h
index e0220fc4036694f7d810db3c6b306d6b6ada3b47..25a5c0f82392108a3dc82d41cd3c7490db682437 100644 (file)
--- a/fs/nfs/fscache.h
+++ b/fs/nfs/fscache.h
@@ -8,6 +8,7 @@
 #ifndef _NFS_FSCACHE_H
 #define _NFS_FSCACHE_H
 
+#include <linux/swap.h>
 #include <linux/nfs_fs.h>
 #include <linux/nfs_mount.h>
 #include <linux/nfs4_mount.h>
@@ -52,7 +53,7 @@ extern void __nfs_readpage_to_fscache(struct inode *, struct page *);
 static inline int nfs_fscache_release_page(struct page *page, gfp_t gfp)
 {
        if (PageFsCache(page)) {
-               if (!gfpflags_allow_blocking(gfp) || !(gfp & __GFP_FS))
+               if (current_is_kswapd() || !(gfp & __GFP_FS))
                        return false;
                wait_on_page_fscache(page);
                fscache_note_page_release(nfs_i_fscache(page->mapping->host));