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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 51D95C4332D for ; Fri, 20 Mar 2020 18:44:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 17BAF20777 for ; Fri, 20 Mar 2020 18:44:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="VyRgr5Le" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17BAF20777 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 938776B0003; Fri, 20 Mar 2020 14:44:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C18C6B0005; Fri, 20 Mar 2020 14:44:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 789F96B0007; Fri, 20 Mar 2020 14:44:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0081.hostedemail.com [216.40.44.81]) by kanga.kvack.org (Postfix) with ESMTP id 5DA056B0003 for ; Fri, 20 Mar 2020 14:44:21 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id F3EC18248068 for ; Fri, 20 Mar 2020 18:44:20 +0000 (UTC) X-FDA: 76616615880.16.spark42_7d3ba00fa9c03 X-HE-Tag: spark42_7d3ba00fa9c03 X-Filterd-Recvd-Size: 4472 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Mar 2020 18:44:20 +0000 (UTC) Received: from sol.localdomain (c-107-3-166-239.hsd1.ca.comcast.net [107.3.166.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9895A2051A; Fri, 20 Mar 2020 18:44:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584729860; bh=5pZqAya2TSGOpl920vnSvHi9jKtNxmt64mv8PAdFI3A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=VyRgr5LelhylhzZlcVYEomgTosDPQP2hFACxdbSh1g8cxdYQj8CURPVdAol5gz7Rg ExBTz35Q8O5vnKTi+DibRxVv6t5mUtWBLawcyZ38iKpEQsk8AEImcLdLmORUJEYHIs e+oJ5iVBFhvWYyFYTKBJXTMNGFlzAY6GTvEUiHMY= Date: Fri, 20 Mar 2020 11:44:18 -0700 From: Eric Biggers To: Matthew Wilcox Cc: Andrew Morton , 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, William Kucharski Subject: Re: [PATCH v9 21/25] ext4: Pass the inode to ext4_mpage_readpages Message-ID: <20200320184418.GH851@sol.localdomain> References: <20200320142231.2402-1-willy@infradead.org> <20200320142231.2402-22-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200320142231.2402-22-willy@infradead.org> 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: On Fri, Mar 20, 2020 at 07:22:27AM -0700, Matthew Wilcox wrote: > From: "Matthew Wilcox (Oracle)" > > This function now only uses the mapping argument to look up the inode, > and both callers already have the inode, so just pass the inode instead > of the mapping. > > Signed-off-by: Matthew Wilcox (Oracle) > Reviewed-by: William Kucharski > --- > fs/ext4/ext4.h | 2 +- > fs/ext4/inode.c | 4 ++-- > fs/ext4/readpage.c | 3 +-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h > index 1570a0b51b73..bc1b34ba6eab 100644 > --- a/fs/ext4/ext4.h > +++ b/fs/ext4/ext4.h > @@ -3278,7 +3278,7 @@ static inline void ext4_set_de_type(struct super_block *sb, > } > > /* readpages.c */ > -extern int ext4_mpage_readpages(struct address_space *mapping, > +extern int ext4_mpage_readpages(struct inode *inode, > struct readahead_control *rac, struct page *page); > extern int __init ext4_init_post_read_processing(void); > extern void ext4_exit_post_read_processing(void); > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index d674c5f9066c..4f3703c1408d 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -3226,7 +3226,7 @@ static int ext4_readpage(struct file *file, struct page *page) > ret = ext4_readpage_inline(inode, page); > > if (ret == -EAGAIN) > - return ext4_mpage_readpages(page->mapping, NULL, page); > + return ext4_mpage_readpages(inode, NULL, page); > > return ret; > } > @@ -3239,7 +3239,7 @@ static void ext4_readahead(struct readahead_control *rac) > if (ext4_has_inline_data(inode)) > return; > > - ext4_mpage_readpages(rac->mapping, rac, NULL); > + ext4_mpage_readpages(inode, rac, NULL); > } > > static void ext4_invalidatepage(struct page *page, unsigned int offset, > diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c > index 66275f25235d..5761e9961682 100644 > --- a/fs/ext4/readpage.c > +++ b/fs/ext4/readpage.c > @@ -221,13 +221,12 @@ static inline loff_t ext4_readpage_limit(struct inode *inode) > return i_size_read(inode); > } > > -int ext4_mpage_readpages(struct address_space *mapping, > +int ext4_mpage_readpages(struct inode *inode, > struct readahead_control *rac, struct page *page) > { > struct bio *bio = NULL; > sector_t last_block_in_bio = 0; > > - struct inode *inode = mapping->host; > const unsigned blkbits = inode->i_blkbits; > const unsigned blocks_per_page = PAGE_SIZE >> blkbits; > const unsigned blocksize = 1 << blkbits; > -- Reviewed-by: Eric Biggers - Eric