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=ham 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 0E5BAC4332D for ; Fri, 20 Mar 2020 18:52:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CCA6020786 for ; Fri, 20 Mar 2020 18:52:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="DRP5T0p/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCA6020786 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 7AEBD6B0008; Fri, 20 Mar 2020 14:52:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 75DD06B000A; Fri, 20 Mar 2020 14:52:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 625BD6B000D; Fri, 20 Mar 2020 14:52:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0136.hostedemail.com [216.40.44.136]) by kanga.kvack.org (Postfix) with ESMTP id 4721D6B0008 for ; Fri, 20 Mar 2020 14:52:41 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id DBB0C181AC9CB for ; Fri, 20 Mar 2020 18:52:40 +0000 (UTC) X-FDA: 76616636880.11.shop76_347976dd4ca0b X-HE-Tag: shop76_347976dd4ca0b X-Filterd-Recvd-Size: 3764 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Mar 2020 18:52:40 +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 8A87620775; Fri, 20 Mar 2020 18:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584730359; bh=3gbE+VlmfoN5OPIi14o+iI+EIYlVydyt9rn3Y0AvnsY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=DRP5T0p/QJ3Eo+pOi6lUoz/NYAigZgi8TtvZjTzfHQ8g8KelV4xmxmhMYNwPEnhOr jaoWnNJhMTgDQ5E65odJ0yXJp9dcxGm+62eg5najbweP0lRbI54UDJTXPJXqLKn/F1 CPgqcXc4KjgX4h9bEPayy9PiHh2SFNg2cqPbd3s0= Date: Fri, 20 Mar 2020 11:52:38 -0700 From: Eric Biggers To: Matthew Wilcox Cc: Andrew Morton , linux-xfs@vger.kernel.org, William Kucharski , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-mm@kvack.org, ocfs2-devel@oss.oracle.com, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-btrfs@vger.kernel.org Subject: Re: [PATCH v9 23/25] f2fs: Pass the inode to f2fs_mpage_readpages Message-ID: <20200320185238.GJ851@sol.localdomain> References: <20200320142231.2402-1-willy@infradead.org> <20200320142231.2402-24-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200320142231.2402-24-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:29AM -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/f2fs/data.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > index 237dff36fe73..c8b042979fc4 100644 > --- a/fs/f2fs/data.c > +++ b/fs/f2fs/data.c > @@ -2159,12 +2159,11 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, > * use ->readpage() or do the necessary surgery to decouple ->readpages() > * from read-ahead. > */ > -static int f2fs_mpage_readpages(struct address_space *mapping, > +static int f2fs_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; > struct f2fs_map_blocks map; > #ifdef CONFIG_F2FS_FS_COMPRESSION > struct compress_ctx cc = { > @@ -2276,7 +2275,7 @@ static int f2fs_read_data_page(struct file *file, struct page *page) > if (f2fs_has_inline_data(inode)) > ret = f2fs_read_inline_data(inode, page); > if (ret == -EAGAIN) > - ret = f2fs_mpage_readpages(page_file_mapping(page), NULL, page); > + ret = f2fs_mpage_readpages(inode, NULL, page); > return ret; > } > > @@ -2293,7 +2292,7 @@ static void f2fs_readahead(struct readahead_control *rac) > if (f2fs_has_inline_data(inode)) > return; > > - f2fs_mpage_readpages(rac->mapping, rac, NULL); > + f2fs_mpage_readpages(inode, rac, NULL); > } > > int f2fs_encrypt_one_page(struct f2fs_io_info *fio) > -- Reviewed-by: Eric Biggers - Eric