From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06375C38A29 for ; Tue, 14 Apr 2020 15:03:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9871F2078B for ; Tue, 14 Apr 2020 15:03:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="ecAmG9YV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9871F2078B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E5AA58E001A; Tue, 14 Apr 2020 11:02:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8BCF8E001E; Tue, 14 Apr 2020 11:02:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6CA958E001B; Tue, 14 Apr 2020 11:02:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0120.hostedemail.com [216.40.44.120]) by kanga.kvack.org (Postfix) with ESMTP id 61E828E001B for ; Tue, 14 Apr 2020 11:02:43 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 216A52476 for ; Tue, 14 Apr 2020 15:02:43 +0000 (UTC) X-FDA: 76706777406.27.crook13_51db9b0c82558 X-HE-Tag: crook13_51db9b0c82558 X-Filterd-Recvd-Size: 26065 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Tue, 14 Apr 2020 15:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=xlFhOjtvGKVpMpS6fBpGJCpyhIT8JuzisICTYyrHhMI=; b=ecAmG9YVnKYe2SfxIeLjCr1s5y PHgE06p4604KH5o/w99xtGJlidPdjo1jkWfsorVbadbfhMH3xeIcjw6fJ9DSWDreQYcwKX2W8Va38 p7ZKDWKN5hdqIHXite02aOlrZshdTlHU0qmlnPFSjb/U4tKDwbhsSIOo6oGmuH7fIofzjbg07Zvcr Ph9qEULLcDYc3hMj+ljBXhrNbyd82Q/7eNCP7CWh55k9ln3IHQnas4GJjcXGxQ/gnrG5mpoEOfGyu Cy3wJTJfwxFP0Z3aFDPT32EmB043stxmTJe+iZrLNQRAU/LmSwxr1ovGU0Hvnu+H3PYX8YTdSoIRJ GDaR6l0Q==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jON5A-0006P6-9Y; Tue, 14 Apr 2020 15:02:36 +0000 From: Matthew Wilcox To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, ocfs2-devel@oss.oracle.com, linux-xfs@vger.kernel.org, Junxiao Bi , Joseph Qi , Dave Chinner , John Hubbard , Christoph Hellwig , William Kucharski Subject: [PATCH v11 16/25] fs: Convert mpage_readpages to mpage_readahead Date: Tue, 14 Apr 2020 08:02:24 -0700 Message-Id: <20200414150233.24495-17-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200414150233.24495-1-willy@infradead.org> References: <20200414150233.24495-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Matthew Wilcox (Oracle)" Implement the new readahead aop and convert all callers (block_dev, exfat, ext2, fat, gfs2, hpfs, isofs, jfs, nilfs2, ocfs2, omfs, qnx6, reiserfs & udf). The callers are all trivial except for GFS2 & OCFS2. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Junxiao Bi # ocfs2 Reviewed-by: Joseph Qi # ocfs2 Reviewed-by: Dave Chinner Reviewed-by: John Hubbard Reviewed-by: Christoph Hellwig Reviewed-by: William Kucharski --- fs/block_dev.c | 7 +++---- fs/exfat/inode.c | 7 +++---- fs/ext2/inode.c | 10 ++++------ fs/fat/inode.c | 7 +++---- fs/gfs2/aops.c | 23 ++++++++--------------- fs/hpfs/file.c | 7 +++---- fs/iomap/buffered-io.c | 2 +- fs/isofs/inode.c | 7 +++---- fs/jfs/inode.c | 7 +++---- fs/mpage.c | 38 +++++++++++--------------------------- fs/nilfs2/inode.c | 15 +++------------ fs/ocfs2/aops.c | 34 +++++++++++++--------------------- fs/omfs/file.c | 7 +++---- fs/qnx6/inode.c | 7 +++---- fs/reiserfs/inode.c | 8 +++----- fs/udf/inode.c | 7 +++---- include/linux/mpage.h | 4 ++-- mm/migrate.c | 2 +- 18 files changed, 73 insertions(+), 126 deletions(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index 52b6f646cdbd..41f720bef66b 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -615,10 +615,9 @@ static int blkdev_readpage(struct file * file, struc= t page * page) return block_read_full_page(page, blkdev_get_block); } =20 -static int blkdev_readpages(struct file *file, struct address_space *map= ping, - struct list_head *pages, unsigned nr_pages) +static void blkdev_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, blkdev_get_block); + mpage_readahead(rac, blkdev_get_block); } =20 static int blkdev_write_begin(struct file *file, struct address_space *m= apping, @@ -2076,7 +2075,7 @@ static int blkdev_writepages(struct address_space *= mapping, =20 static const struct address_space_operations def_blk_aops =3D { .readpage =3D blkdev_readpage, - .readpages =3D blkdev_readpages, + .readahead =3D blkdev_readahead, .writepage =3D blkdev_writepage, .write_begin =3D blkdev_write_begin, .write_end =3D blkdev_write_end, diff --git a/fs/exfat/inode.c b/fs/exfat/inode.c index 06887492f54b..785ead346543 100644 --- a/fs/exfat/inode.c +++ b/fs/exfat/inode.c @@ -372,10 +372,9 @@ static int exfat_readpage(struct file *file, struct = page *page) return mpage_readpage(page, exfat_get_block); } =20 -static int exfat_readpages(struct file *file, struct address_space *mapp= ing, - struct list_head *pages, unsigned int nr_pages) +static void exfat_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, exfat_get_block); + mpage_readahead(rac, exfat_get_block); } =20 static int exfat_writepage(struct page *page, struct writeback_control *= wbc) @@ -502,7 +501,7 @@ int exfat_block_truncate_page(struct inode *inode, lo= ff_t from) =20 static const struct address_space_operations exfat_aops =3D { .readpage =3D exfat_readpage, - .readpages =3D exfat_readpages, + .readahead =3D exfat_readahead, .writepage =3D exfat_writepage, .writepages =3D exfat_writepages, .write_begin =3D exfat_write_begin, diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index c885cf7d724b..2875c0a705b5 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -877,11 +877,9 @@ static int ext2_readpage(struct file *file, struct p= age *page) return mpage_readpage(page, ext2_get_block); } =20 -static int -ext2_readpages(struct file *file, struct address_space *mapping, - struct list_head *pages, unsigned nr_pages) +static void ext2_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, ext2_get_block); + mpage_readahead(rac, ext2_get_block); } =20 static int @@ -967,7 +965,7 @@ ext2_dax_writepages(struct address_space *mapping, st= ruct writeback_control *wbc =20 const struct address_space_operations ext2_aops =3D { .readpage =3D ext2_readpage, - .readpages =3D ext2_readpages, + .readahead =3D ext2_readahead, .writepage =3D ext2_writepage, .write_begin =3D ext2_write_begin, .write_end =3D ext2_write_end, @@ -981,7 +979,7 @@ const struct address_space_operations ext2_aops =3D { =20 const struct address_space_operations ext2_nobh_aops =3D { .readpage =3D ext2_readpage, - .readpages =3D ext2_readpages, + .readahead =3D ext2_readahead, .writepage =3D ext2_nobh_writepage, .write_begin =3D ext2_nobh_write_begin, .write_end =3D nobh_write_end, diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 71946da84388..e6e68b2274a5 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -210,10 +210,9 @@ static int fat_readpage(struct file *file, struct pa= ge *page) return mpage_readpage(page, fat_get_block); } =20 -static int fat_readpages(struct file *file, struct address_space *mappin= g, - struct list_head *pages, unsigned nr_pages) +static void fat_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, fat_get_block); + mpage_readahead(rac, fat_get_block); } =20 static void fat_write_failed(struct address_space *mapping, loff_t to) @@ -344,7 +343,7 @@ int fat_block_truncate_page(struct inode *inode, loff= _t from) =20 static const struct address_space_operations fat_aops =3D { .readpage =3D fat_readpage, - .readpages =3D fat_readpages, + .readahead =3D fat_readahead, .writepage =3D fat_writepage, .writepages =3D fat_writepages, .write_begin =3D fat_write_begin, diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 786c1ce8f030..72c9560f4467 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -577,7 +577,7 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *b= uf, loff_t *pos, } =20 /** - * gfs2_readpages - Read a bunch of pages at once + * gfs2_readahead - Read a bunch of pages at once * @file: The file to read from * @mapping: Address space info * @pages: List of pages to read @@ -590,31 +590,24 @@ int gfs2_internal_read(struct gfs2_inode *ip, char = *buf, loff_t *pos, * obviously not something we'd want to do on too regular a basis. * Any I/O we ignore at this time will be done via readpage later. * 2. We don't handle stuffed files here we let readpage do the honours. - * 3. mpage_readpages() does most of the heavy lifting in the common cas= e. + * 3. mpage_readahead() does most of the heavy lifting in the common cas= e. * 4. gfs2_block_map() is relied upon to set BH_Boundary in the right pl= aces. */ =20 -static int gfs2_readpages(struct file *file, struct address_space *mappi= ng, - struct list_head *pages, unsigned nr_pages) +static void gfs2_readahead(struct readahead_control *rac) { - struct inode *inode =3D mapping->host; + struct inode *inode =3D rac->mapping->host; struct gfs2_inode *ip =3D GFS2_I(inode); - struct gfs2_sbd *sdp =3D GFS2_SB(inode); struct gfs2_holder gh; - int ret; =20 gfs2_holder_init(ip->i_gl, LM_ST_SHARED, 0, &gh); - ret =3D gfs2_glock_nq(&gh); - if (unlikely(ret)) + if (gfs2_glock_nq(&gh)) goto out_uninit; if (!gfs2_is_stuffed(ip)) - ret =3D mpage_readpages(mapping, pages, nr_pages, gfs2_block_map); + mpage_readahead(rac, gfs2_block_map); gfs2_glock_dq(&gh); out_uninit: gfs2_holder_uninit(&gh); - if (unlikely(gfs2_withdrawn(sdp))) - ret =3D -EIO; - return ret; } =20 /** @@ -833,7 +826,7 @@ static const struct address_space_operations gfs2_aop= s =3D { .writepage =3D gfs2_writepage, .writepages =3D gfs2_writepages, .readpage =3D gfs2_readpage, - .readpages =3D gfs2_readpages, + .readahead =3D gfs2_readahead, .bmap =3D gfs2_bmap, .invalidatepage =3D gfs2_invalidatepage, .releasepage =3D gfs2_releasepage, @@ -847,7 +840,7 @@ static const struct address_space_operations gfs2_jda= ta_aops =3D { .writepage =3D gfs2_jdata_writepage, .writepages =3D gfs2_jdata_writepages, .readpage =3D gfs2_readpage, - .readpages =3D gfs2_readpages, + .readahead =3D gfs2_readahead, .set_page_dirty =3D jdata_set_page_dirty, .bmap =3D gfs2_bmap, .invalidatepage =3D gfs2_invalidatepage, diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index b36abf9cb345..2de0d3492d15 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c @@ -125,10 +125,9 @@ static int hpfs_writepage(struct page *page, struct = writeback_control *wbc) return block_write_full_page(page, hpfs_get_block, wbc); } =20 -static int hpfs_readpages(struct file *file, struct address_space *mappi= ng, - struct list_head *pages, unsigned nr_pages) +static void hpfs_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, hpfs_get_block); + mpage_readahead(rac, hpfs_get_block); } =20 static int hpfs_writepages(struct address_space *mapping, @@ -198,7 +197,7 @@ static int hpfs_fiemap(struct inode *inode, struct fi= emap_extent_info *fieinfo, const struct address_space_operations hpfs_aops =3D { .readpage =3D hpfs_readpage, .writepage =3D hpfs_writepage, - .readpages =3D hpfs_readpages, + .readahead =3D hpfs_readahead, .writepages =3D hpfs_writepages, .write_begin =3D hpfs_write_begin, .write_end =3D hpfs_write_end, diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 89e21961d1ad..075db1e71b14 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -367,7 +367,7 @@ iomap_readpage(struct page *page, const struct iomap_= ops *ops) } =20 /* - * Just like mpage_readpages and block_read_full_page we always + * Just like mpage_readahead and block_read_full_page we always * return 0 and just mark the page as PageError on errors. This * should be cleaned up all through the stack eventually. */ diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 62c0462dc89f..95b1f377ad09 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -1185,10 +1185,9 @@ static int isofs_readpage(struct file *file, struc= t page *page) return mpage_readpage(page, isofs_get_block); } =20 -static int isofs_readpages(struct file *file, struct address_space *mapp= ing, - struct list_head *pages, unsigned nr_pages) +static void isofs_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, isofs_get_block); + mpage_readahead(rac, isofs_get_block); } =20 static sector_t _isofs_bmap(struct address_space *mapping, sector_t bloc= k) @@ -1198,7 +1197,7 @@ static sector_t _isofs_bmap(struct address_space *m= apping, sector_t block) =20 static const struct address_space_operations isofs_aops =3D { .readpage =3D isofs_readpage, - .readpages =3D isofs_readpages, + .readahead =3D isofs_readahead, .bmap =3D _isofs_bmap }; =20 diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index 9486afcdac76..6f65bfa9f18d 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -296,10 +296,9 @@ static int jfs_readpage(struct file *file, struct pa= ge *page) return mpage_readpage(page, jfs_get_block); } =20 -static int jfs_readpages(struct file *file, struct address_space *mappin= g, - struct list_head *pages, unsigned nr_pages) +static void jfs_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, jfs_get_block); + mpage_readahead(rac, jfs_get_block); } =20 static void jfs_write_failed(struct address_space *mapping, loff_t to) @@ -358,7 +357,7 @@ static ssize_t jfs_direct_IO(struct kiocb *iocb, stru= ct iov_iter *iter) =20 const struct address_space_operations jfs_aops =3D { .readpage =3D jfs_readpage, - .readpages =3D jfs_readpages, + .readahead =3D jfs_readahead, .writepage =3D jfs_writepage, .writepages =3D jfs_writepages, .write_begin =3D jfs_write_begin, diff --git a/fs/mpage.c b/fs/mpage.c index ccba3c4c4479..830e6cc2a9e7 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -91,7 +91,7 @@ mpage_alloc(struct block_device *bdev, } =20 /* - * support function for mpage_readpages. The fs supplied get_block migh= t + * support function for mpage_readahead. The fs supplied get_block migh= t * return an up to date buffer. This is used to map that buffer into * the page, which allows readpage to avoid triggering a duplicate call * to get_block. @@ -338,13 +338,8 @@ static struct bio *do_mpage_readpage(struct mpage_re= adpage_args *args) } =20 /** - * mpage_readpages - populate an address space with some pages & start r= eads against them - * @mapping: the address_space - * @pages: The address of a list_head which contains the target pages. = These - * pages have their ->index populated and are otherwise uninitialised. - * The page at @pages->prev has the lowest file offset, and reads shou= ld be - * issued in @pages->prev to @pages->next order. - * @nr_pages: The number of pages at *@pages + * mpage_readahead - start reads against pages + * @rac: Describes which pages to read. * @get_block: The filesystem's block mapper function. * * This function walks the pages and the blocks within each page, buildi= ng and @@ -381,36 +376,25 @@ static struct bio *do_mpage_readpage(struct mpage_r= eadpage_args *args) * * This all causes the disk requests to be issued in the correct order. */ -int -mpage_readpages(struct address_space *mapping, struct list_head *pages, - unsigned nr_pages, get_block_t get_block) +void mpage_readahead(struct readahead_control *rac, get_block_t get_bloc= k) { + struct page *page; struct mpage_readpage_args args =3D { .get_block =3D get_block, .is_readahead =3D true, }; - unsigned page_idx; - - for (page_idx =3D 0; page_idx < nr_pages; page_idx++) { - struct page *page =3D lru_to_page(pages); =20 + while ((page =3D readahead_page(rac))) { prefetchw(&page->flags); - list_del(&page->lru); - if (!add_to_page_cache_lru(page, mapping, - page->index, - readahead_gfp_mask(mapping))) { - args.page =3D page; - args.nr_pages =3D nr_pages - page_idx; - args.bio =3D do_mpage_readpage(&args); - } + args.page =3D page; + args.nr_pages =3D readahead_count(rac); + args.bio =3D do_mpage_readpage(&args); put_page(page); } - BUG_ON(!list_empty(pages)); if (args.bio) mpage_bio_submit(REQ_OP_READ, REQ_RAHEAD, args.bio); - return 0; } -EXPORT_SYMBOL(mpage_readpages); +EXPORT_SYMBOL(mpage_readahead); =20 /* * This isn't called much at all @@ -563,7 +547,7 @@ static int __mpage_writepage(struct page *page, struc= t writeback_control *wbc, * Page has buffers, but they are all unmapped. The page was * created by pagein or read over a hole which was handled by * block_read_full_page(). If this address_space is also - * using mpage_readpages then this can rarely happen. + * using mpage_readahead then this can rarely happen. */ goto confused; } diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 671085512e0f..ceeb3b441844 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -145,18 +145,9 @@ static int nilfs_readpage(struct file *file, struct = page *page) return mpage_readpage(page, nilfs_get_block); } =20 -/** - * nilfs_readpages() - implement readpages() method of nilfs_aops {} - * address_space_operations. - * @file - file struct of the file to be read - * @mapping - address_space struct used for reading multiple pages - * @pages - the pages to be read - * @nr_pages - number of pages to be read - */ -static int nilfs_readpages(struct file *file, struct address_space *mapp= ing, - struct list_head *pages, unsigned int nr_pages) +static void nilfs_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, nilfs_get_block); + mpage_readahead(rac, nilfs_get_block); } =20 static int nilfs_writepages(struct address_space *mapping, @@ -308,7 +299,7 @@ const struct address_space_operations nilfs_aops =3D = { .readpage =3D nilfs_readpage, .writepages =3D nilfs_writepages, .set_page_dirty =3D nilfs_set_page_dirty, - .readpages =3D nilfs_readpages, + .readahead =3D nilfs_readahead, .write_begin =3D nilfs_write_begin, .write_end =3D nilfs_write_end, /* .releasepage =3D nilfs_releasepage, */ diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 3a67a6518ddf..3bfb4147895a 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -350,14 +350,11 @@ static int ocfs2_readpage(struct file *file, struct= page *page) * grow out to a tree. If need be, detecting boundary extents could * trivially be added in a future version of ocfs2_get_block(). */ -static int ocfs2_readpages(struct file *filp, struct address_space *mapp= ing, - struct list_head *pages, unsigned nr_pages) +static void ocfs2_readahead(struct readahead_control *rac) { - int ret, err =3D -EIO; - struct inode *inode =3D mapping->host; + int ret; + struct inode *inode =3D rac->mapping->host; struct ocfs2_inode_info *oi =3D OCFS2_I(inode); - loff_t start; - struct page *last; =20 /* * Use the nonblocking flag for the dlm code to avoid page @@ -365,36 +362,31 @@ static int ocfs2_readpages(struct file *filp, struc= t address_space *mapping, */ ret =3D ocfs2_inode_lock_full(inode, NULL, 0, OCFS2_LOCK_NONBLOCK); if (ret) - return err; + return; =20 - if (down_read_trylock(&oi->ip_alloc_sem) =3D=3D 0) { - ocfs2_inode_unlock(inode, 0); - return err; - } + if (down_read_trylock(&oi->ip_alloc_sem) =3D=3D 0) + goto out_unlock; =20 /* * Don't bother with inline-data. There isn't anything * to read-ahead in that case anyway... */ if (oi->ip_dyn_features & OCFS2_INLINE_DATA_FL) - goto out_unlock; + goto out_up; =20 /* * Check whether a remote node truncated this file - we just * drop out in that case as it's not worth handling here. */ - last =3D lru_to_page(pages); - start =3D (loff_t)last->index << PAGE_SHIFT; - if (start >=3D i_size_read(inode)) - goto out_unlock; + if (readahead_pos(rac) >=3D i_size_read(inode)) + goto out_up; =20 - err =3D mpage_readpages(mapping, pages, nr_pages, ocfs2_get_block); + mpage_readahead(rac, ocfs2_get_block); =20 -out_unlock: +out_up: up_read(&oi->ip_alloc_sem); +out_unlock: ocfs2_inode_unlock(inode, 0); - - return err; } =20 /* Note: Because we don't support holes, our allocation has @@ -2474,7 +2466,7 @@ static ssize_t ocfs2_direct_IO(struct kiocb *iocb, = struct iov_iter *iter) =20 const struct address_space_operations ocfs2_aops =3D { .readpage =3D ocfs2_readpage, - .readpages =3D ocfs2_readpages, + .readahead =3D ocfs2_readahead, .writepage =3D ocfs2_writepage, .write_begin =3D ocfs2_write_begin, .write_end =3D ocfs2_write_end, diff --git a/fs/omfs/file.c b/fs/omfs/file.c index d640b9388238..d7b5f09d298c 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c @@ -289,10 +289,9 @@ static int omfs_readpage(struct file *file, struct p= age *page) return block_read_full_page(page, omfs_get_block); } =20 -static int omfs_readpages(struct file *file, struct address_space *mappi= ng, - struct list_head *pages, unsigned nr_pages) +static void omfs_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, omfs_get_block); + mpage_readahead(rac, omfs_get_block); } =20 static int omfs_writepage(struct page *page, struct writeback_control *w= bc) @@ -373,7 +372,7 @@ const struct inode_operations omfs_file_inops =3D { =20 const struct address_space_operations omfs_aops =3D { .readpage =3D omfs_readpage, - .readpages =3D omfs_readpages, + .readahead =3D omfs_readahead, .writepage =3D omfs_writepage, .writepages =3D omfs_writepages, .write_begin =3D omfs_write_begin, diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c index 345db56c98fd..755293c8c71a 100644 --- a/fs/qnx6/inode.c +++ b/fs/qnx6/inode.c @@ -99,10 +99,9 @@ static int qnx6_readpage(struct file *file, struct pag= e *page) return mpage_readpage(page, qnx6_get_block); } =20 -static int qnx6_readpages(struct file *file, struct address_space *mappi= ng, - struct list_head *pages, unsigned nr_pages) +static void qnx6_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, qnx6_get_block); + mpage_readahead(rac, qnx6_get_block); } =20 /* @@ -499,7 +498,7 @@ static sector_t qnx6_bmap(struct address_space *mappi= ng, sector_t block) } static const struct address_space_operations qnx6_aops =3D { .readpage =3D qnx6_readpage, - .readpages =3D qnx6_readpages, + .readahead =3D qnx6_readahead, .bmap =3D qnx6_bmap }; =20 diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 6419e6dacc39..0031070b3692 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -1160,11 +1160,9 @@ int reiserfs_get_block(struct inode *inode, sector= _t block, return retval; } =20 -static int -reiserfs_readpages(struct file *file, struct address_space *mapping, - struct list_head *pages, unsigned nr_pages) +static void reiserfs_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, reiserfs_get_block); + mpage_readahead(rac, reiserfs_get_block); } =20 /* @@ -3434,7 +3432,7 @@ int reiserfs_setattr(struct dentry *dentry, struct = iattr *attr) const struct address_space_operations reiserfs_address_space_operations = =3D { .writepage =3D reiserfs_writepage, .readpage =3D reiserfs_readpage, - .readpages =3D reiserfs_readpages, + .readahead =3D reiserfs_readahead, .releasepage =3D reiserfs_releasepage, .invalidatepage =3D reiserfs_invalidatepage, .write_begin =3D reiserfs_write_begin, diff --git a/fs/udf/inode.c b/fs/udf/inode.c index e875bc5668ee..adaba8e8b326 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -195,10 +195,9 @@ static int udf_readpage(struct file *file, struct pa= ge *page) return mpage_readpage(page, udf_get_block); } =20 -static int udf_readpages(struct file *file, struct address_space *mappin= g, - struct list_head *pages, unsigned nr_pages) +static void udf_readahead(struct readahead_control *rac) { - return mpage_readpages(mapping, pages, nr_pages, udf_get_block); + mpage_readahead(rac, udf_get_block); } =20 static int udf_write_begin(struct file *file, struct address_space *mapp= ing, @@ -234,7 +233,7 @@ static sector_t udf_bmap(struct address_space *mappin= g, sector_t block) =20 const struct address_space_operations udf_aops =3D { .readpage =3D udf_readpage, - .readpages =3D udf_readpages, + .readahead =3D udf_readahead, .writepage =3D udf_writepage, .writepages =3D udf_writepages, .write_begin =3D udf_write_begin, diff --git a/include/linux/mpage.h b/include/linux/mpage.h index 001f1fcf9836..f4f5e90a6844 100644 --- a/include/linux/mpage.h +++ b/include/linux/mpage.h @@ -13,9 +13,9 @@ #ifdef CONFIG_BLOCK =20 struct writeback_control; +struct readahead_control; =20 -int mpage_readpages(struct address_space *mapping, struct list_head *pag= es, - unsigned nr_pages, get_block_t get_block); +void mpage_readahead(struct readahead_control *, get_block_t get_block); int mpage_readpage(struct page *page, get_block_t get_block); int mpage_writepages(struct address_space *mapping, struct writeback_control *wbc, get_block_t get_block); diff --git a/mm/migrate.c b/mm/migrate.c index 7160c1556f79..f66f93f9a5e2 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1032,7 +1032,7 @@ static int __unmap_and_move(struct page *page, stru= ct page *newpage, * to the LRU. Later, when the IO completes the pages are * marked uptodate and unlocked. However, the queueing * could be merging multiple pages for one bio (e.g. - * mpage_readpages). If an allocation happens for the + * mpage_readahead). If an allocation happens for the * second or third page, the process can end up locking * the same page twice and deadlocking. Rather than * trying to be clever about what pages can be locked, --=20 2.25.1