fs: Remove AOP_FLAG_NOFS

With all users of this flag gone, we can stop testing whether it's set.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/netfs/buffered_read.c b/fs/netfs/buffered_read.c
index 281a88a..65c17c5 100644 (file)
--- a/fs/netfs/buffered_read.c
+++ b/fs/netfs/buffered_read.c
@@ -302,7 +302,6 @@ zero_out:
  * @mapping: The mapping to read from
  * @pos: File position at which the write will begin
  * @len: The length of the write (may extend beyond the end of the folio chosen)
- * @aop_flags: AOP_* flags
  * @_folio: Where to put the resultant folio
  * @_fsdata: Place for the netfs to store a cookie
  *
@@ -335,16 +334,13 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,
        struct netfs_io_request *rreq;
        struct netfs_i_context *ctx = netfs_i_context(file_inode(file ));
        struct folio *folio;
-       unsigned int fgp_flags;
+       unsigned int fgp_flags = FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE;
        pgoff_t index = pos >> PAGE_SHIFT;
        int ret;
 
        DEFINE_READAHEAD(ractl, file, NULL, mapping, index);
 
 retry:
-       fgp_flags = FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE;
-       if (aop_flags & AOP_FLAG_NOFS)
-               fgp_flags |= FGP_NOFS;
        folio = __filemap_get_folio(mapping, index, fgp_flags,
                                    mapping_gfp_mask(mapping));
        if (!folio)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index e108aff..f81bc5c 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -275,10 +275,6 @@ enum positive_aop_returns {
        AOP_TRUNCATED_PAGE      = 0x80001,
 };
 
-#define AOP_FLAG_NOFS                  0x0002 /* used by filesystem to direct
-                                               * helper code (eg buffer layer)
-                                               * to clear GFP_FS from alloc */
-
 /*
  * oh the beauties of C type declarations.
  */

diff --git a/mm/folio-compat.c b/mm/folio-compat.c
index 46fa179..3e42ddb 100644 (file)
--- a/mm/folio-compat.c
+++ b/mm/folio-compat.c
@@ -135,8 +135,6 @@ struct page *grab_cache_page_write_begin(struct address_space *mapping,
 {
        unsigned fgp_flags = FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE;
 
-       if (flags & AOP_FLAG_NOFS)
-               fgp_flags |= FGP_NOFS;
        return pagecache_get_page(mapping, index, fgp_flags,
                        mapping_gfp_mask(mapping));
 }