erofs-convert-uncompressed-files-from-readpages-to-readahead.patch removed from -mm tree
The patch titled
Subject: erofs: convert uncompressed files from readpages to readahead
has been removed from the -mm tree. Its filename was
erofs-convert-uncompressed-files-from-readpages-to-readahead.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: "Matthew Wilcox (Oracle)" <[email protected]>
Subject: erofs: convert uncompressed files from readpages to readahead
Use the new readahead operation in erofs
Signed-off-by Matthew Wilcox (Oracle) <[email protected]>
Acked-by Gao Xiang <[email protected]>
Reviewed-by William Kucharski <[email protected]>
Reviewed-by Chao Yu <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Cong Wang <[email protected]>
Cc Darrick J. Wong <[email protected]>
Cc Dave Chinner <[email protected]>
Cc Eric Biggers <[email protected]>
Cc Jaegeuk Kim <[email protected]>
Cc John Hubbard <[email protected]>
Cc Joseph Qi <[email protected]>
Cc Junxiao Bi <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Zi Yan <[email protected]>
Cc Johannes Thumshirn <[email protected]>
Cc Miklos Szeredi <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/erofs/data.c | 41 ++++++++++++--------------------- fs/erofs/zdata.c | 2 - include/trace/events/erofs.h | 6 ++-- 3 files changed, 19 insertions(+), 30 deletions(-)
fs/erofs/data.c renamed from fs/erofs/data.c~erofs-convert-uncompressed-files-from-readpages-to-readahead +15 -26
@@ -280,47 +280,36 @@ static int erofs_raw_access_readpage(strreturn 0 ; } -static int erofs_raw_access_readpages (struct file *filp, -struct address_space *mapping, -struct list_head *pages, -unsigned int nr_pages) +static void erofs_raw_access_readahead (struct readahead_control *rac) {erofs_off_t last_block;struct bio *bio =NULL ; -gfp_t gfp =readahead_gfp_mask (mapping); - struct page *page = list_last_entry(pages, struct page, lru); +struct page *page; -trace_erofs_readpages (mapping->host, page, nr_pages, true); - -for (; nr_pages; --nr_pages) { - page = list_entry(pages->prev, struct page, lru); +trace_erofs_readpages (rac->mapping->host,readahead_index (rac), +readahead_count (rac), true); +while ((page =readahead_page (rac))) {prefetchw (&page->flags); -list_del (&page->lru); -if (!add_to_page_cache_lru (page, mapping, page->index, gfp)) { - bio =erofs_read_raw_page (bio, mapping, page, - &last_block, nr_pages, true); - -/* all the page errors are ignored when readahead */ -if (IS_ERR (bio)) { -pr_err ("%s, readahead error at page %lu of nid %llu\n" , - __func__, page->index, -EROFS_I (mapping->host)->nid); + bio =erofs_read_raw_page (bio, rac->mapping, page, &last_block, +readahead_count (rac), true); + +/* all the page errors are ignored when readahead */ +if (IS_ERR (bio)) { +pr_err ("%s, readahead error at page %lu of nid %llu\n" , + __func__, page->index, +EROFS_I (rac->mapping->host)->nid); - bio =NULL ; - } + bio =NULL ; } -/* pages could still be locked */ put_page (page); } -DBG_BUGON (!list_empty (pages));/* the rare case (end in gaps) */ if (bio)submit_bio (bio); -return 0 ; } static int erofs_get_block(struct inode *inode, sector_t iblock,
@@ -358,7 +347,7 @@ static sector_t erofs_bmap(struct addres/* for uncompressed (aligned) files and raw access for other files */ const struct address_space_operations erofs_raw_access_aops = { .readpage = erofs_raw_access_readpage, - .readpages = erofs_raw_access_readpages, + .readahead = erofs_raw_access_readahead, .bmap = erofs_bmap, };
fs/erofs/zdata.c renamed from fs/erofs/zdata.c~erofs-convert-uncompressed-files-from-readpages-to-readahead +1 -1
@@ -1317,7 +1317,7 @@ static int z_erofs_readpages(struct filestruct page *head =NULL ;LIST_HEAD (pagepool); -trace_erofs_readpages (mapping->host,lru_to_page (pages), +trace_erofs_readpages (mapping->host,lru_to_page (pages)->index, nr_pages, false); f.headoffset = (erofs_off_t )lru_to_page (pages)->index <<PAGE_SHIFT ;
include/trace/events/erofs.h renamed from include/trace/events/erofs.h~erofs-convert-uncompressed-files-from-readpages-to-readahead +3 -3
@@ -113,10 +113,10 @@ TRACE_EVENT(erofs_readpage, TRACE_EVENT(erofs_readpages, - TP_PROTO(struct inode *inode, struct page *page, unsigned int nrpage, + TP_PROTO(struct inode *inode, pgoff_t start, unsigned int nrpage, bool raw), - TP_ARGS(inode, page, nrpage, raw), + TP_ARGS(inode, start, nrpage, raw), TP_STRUCT__entry( __field(dev_t, dev )
@@ -129,7 +129,7 @@ TRACE_EVENT(erofs_readpages,TP_fast_assign ( __entry->dev = inode->i_sb->s_dev; __entry->nid =EROFS_I (inode)->nid; - __entry->start = page->index; + __entry->start = start; __entry->nrpage = nrpage; __entry->raw = raw; ),
_
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