With all users of this flag gone, we can stop testing whether it's set. Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> --- fs/ceph/addr.c | 2 -- fs/netfs/read_helper.c | 2 -- include/linux/fs.h | 4 ---- mm/folio-compat.c | 2 -- 4 files changed, 10 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index f40c34f4f526..3a2b98efebf5 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -1288,8 +1288,6 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping, */ if (ci->i_inline_version != CEPH_INLINE_NONE) { unsigned int 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/fs/netfs/read_helper.c b/fs/netfs/read_helper.c index 501da990c259..de0dfb37746b 100644 --- a/fs/netfs/read_helper.c +++ b/fs/netfs/read_helper.c @@ -1090,8 +1090,6 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, 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 4db0893750aa..bdbf5dcdb272 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -274,10 +274,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 749555a232a8..540c4949e9a1 100644 --- a/mm/folio-compat.c +++ b/mm/folio-compat.c @@ -134,8 +134,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)); } -- 2.34.1