Commit 236d93c4 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

fs: Remove AOP_FLAG_NOFS 



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

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 832ee62d

fs/netfs/buffered_read.c

+1 −5
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len, 
 * @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)

include/linux/fs.h

+0 −4
Original line number Diff line number Diff line
@@ -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.

 */

mm/folio-compat.c

+0 −2
Original line number Diff line number Diff line
@@ -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));

}