mm-move-readahead-nr_pages-check-into-read_pages.patch removed from -mm tree
The patch titled
Subject: mm: move readahead nr_pages check into read_pages
has been removed from the -mm tree. Its filename was
mm-move-readahead-nr_pages-check-into-read_pages.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: "Matthew Wilcox (Oracle)" <[email protected]>
Subject: mm: move readahead nr_pages check into read_pages
Simplify the callers by moving the check for nr_pages and the BUG_ON into read_pages().
Signed-off-by Matthew Wilcox (Oracle) <[email protected]>
Reviewed-by Zi Yan <[email protected]>
Reviewed-by John Hubbard <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
Reviewed-by William Kucharski <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
Cc Chao Yu <[email protected]>
Cc Cong Wang <[email protected]>
Cc Darrick J. Wong <[email protected]>
Cc Dave Chinner <[email protected]>
Cc Eric Biggers <[email protected]>
Cc Gao Xiang <[email protected]>
Cc Jaegeuk Kim <[email protected]>
Cc Joseph Qi <[email protected]>
Cc Junxiao Bi <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Miklos Szeredi <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/readahead.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
mm/readahead.c renamed from mm/readahead.c~mm-move-readahead-nr_pages-check-into-read_pages +7 -5
@@ -119,6 +119,9 @@ static void read_pages(struct address_spstruct blk_plug plug;unsigned page_idx; +if (!nr_pages) +return ; +blk_start_plug (&plug);if (mapping->a_ops->readpages) {
@@ -138,6 +141,8 @@ static void read_pages(struct address_sp out:blk_finish_plug (&plug); + +BUG_ON (!list_empty (pages)); }/*
@@ -180,8 +185,7 @@ void __do_page_cache_readahead(struct ad* contiguous pages before continuing with the next * batch. */ -if (nr_pages) -read_pages (mapping, filp, &page_pool, nr_pages, +read_pages (mapping, filp, &page_pool, nr_pages, gfp_mask); nr_pages =0 ;continue ;
@@ -202,9 +206,7 @@ void __do_page_cache_readahead(struct ad* uptodate then the caller will launch readpage again, and * will then handle the error. */ -if (nr_pages) -read_pages (mapping, filp, &page_pool, nr_pages, gfp_mask); -BUG_ON (!list_empty (&page_pool)); +read_pages (mapping, filp, &page_pool, nr_pages, gfp_mask); }/*
_
Patches currently in -mm which might be from [email protected] are
mm-simplify-calling-a-compound-page-destructor.patch ipc-convert-ipcs_idr-to-xarray.patch ipc-convert-ipcs_idr-to-xarray-update.patch