From: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx> Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx> --- include/linux/fs.h | 3 --- mm/filemap.c | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 2a815560fda0..877bccb9874f 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -260,9 +260,6 @@ enum positive_aop_returns { }; #define AOP_FLAG_CONT_EXPAND 0x0001 /* called from cont_expand */ -#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/filemap.c b/mm/filemap.c index 693f62212a59..07d28fedd62f 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3080,12 +3080,8 @@ struct page *grab_cache_page_write_begin(struct address_space *mapping, pgoff_t index, unsigned flags) { struct page *page; - int fgp_flags = FGP_LOCK|FGP_WRITE|FGP_CREAT; - if (flags & AOP_FLAG_NOFS) - fgp_flags |= FGP_NOFS; - - page = pagecache_get_page(mapping, index, fgp_flags, + page = pagecache_get_page(mapping, index, FGP_LOCK|FGP_WRITE|FGP_CREAT, mapping_gfp_mask(mapping)); if (page) wait_for_stable_page(page); -- 2.16.1