From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Biggers Date: Fri, 20 Mar 2020 11:52:38 -0700 Subject: [Cluster-devel] [PATCH v9 23/25] f2fs: Pass the inode to f2fs_mpage_readpages In-Reply-To: <20200320142231.2402-24-willy@infradead.org> References: <20200320142231.2402-1-willy@infradead.org> <20200320142231.2402-24-willy@infradead.org> Message-ID: <20200320185238.GJ851@sol.localdomain> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 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 7C1D6C43332 for ; Fri, 20 Mar 2020 18:52:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53A2320781 for ; Fri, 20 Mar 2020 18:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584730363; bh=3gbE+VlmfoN5OPIi14o+iI+EIYlVydyt9rn3Y0AvnsY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=wzgr6FBcviSr+K6tqSKyGgrcY7hXz2wR8x7ks/ESamZd1WabDSPThDaXOis1hpRA2 fdCTk8MEiPn+/m9cbDz49j8a8vpvHO3SnHi8OdrdMXPSrvFq9mupET/I+EGxcglGwN HLVmxrvybp3wS+KdA8fZ+xwpNX/lypd9JlQzUD6o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727669AbgCTSwl (ORCPT ); Fri, 20 Mar 2020 14:52:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:46960 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727210AbgCTSwk (ORCPT ); Fri, 20 Mar 2020 14:52:40 -0400 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> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org 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 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=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 44998C4332D for ; Fri, 20 Mar 2020 18:52:50 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F219020775 for ; Fri, 20 Mar 2020 18:52:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="DRP5T0p/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F219020775 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 48kXvz4D49zF0RC for ; Sat, 21 Mar 2020 05:52:47 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=ebiggers@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=default header.b=DRP5T0p/; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 48kXvt0NmwzF0RC for ; Sat, 21 Mar 2020 05:52:42 +1100 (AEDT) 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 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-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cluster-devel@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, William Kucharski , linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Andrew Morton , linux-ext4@vger.kernel.org, linux-erofs@lists.ozlabs.org, ocfs2-devel@oss.oracle.com Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" 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 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=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 0F339C4332B for ; Fri, 20 Mar 2020 18:52:48 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D468F20775; Fri, 20 Mar 2020 18:52:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="La2X1nUi"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="PS6XOhqZ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="DRP5T0p/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D468F20775 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jFMlD-00081R-0V; Fri, 20 Mar 2020 18:52:47 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jFMlC-00081K-MI for linux-f2fs-devel@lists.sourceforge.net; Fri, 20 Mar 2020 18:52:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gvw4tDMU1XMk4Q0AmhrMAwSvsVty/w3O6yT2ucevtvo=; b=La2X1nUicQbVvf03Ca7HCMHIsO iN/TY8VwTXqJ858fwq9aJ428dyrGZHJJrMYl9sZd2MnXN1lSbTc85WB7WxAF0g/0KLD7N97HPkAgX yW/hGeUuXMAAMBFN1vrDxtSUd778VbnLWgGodbaniOl+N1LlYbswtjadw00IiC7FOUSo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=gvw4tDMU1XMk4Q0AmhrMAwSvsVty/w3O6yT2ucevtvo=; b=PS6XOhqZRL+cs/tWZ6SP6iEkeo zAkpzF4bOZcNp+kG5+yEtV7FXppe2houVM8HBkdr9xIGJtj//X5Kaf0WER7jjYAqJF2Ui9fTFJftp 89B3wQdITpqZC6x/7l/gDu+DMrxlMOLZJboye+z+84uO9OEEKhGRKLvtMuSfJH+xlBJk=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jFMlB-00AVQ3-FY for linux-f2fs-devel@lists.sourceforge.net; Fri, 20 Mar 2020 18:52:46 +0000 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 Message-ID: <20200320185238.GJ851@sol.localdomain> References: <20200320142231.2402-1-willy@infradead.org> <20200320142231.2402-24-willy@infradead.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200320142231.2402-24-willy@infradead.org> X-Headers-End: 1jFMlB-00AVQ3-FY Subject: Re: [f2fs-dev] [PATCH v9 23/25] f2fs: Pass the inode to f2fs_mpage_readpages X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cluster-devel@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, William Kucharski , linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Andrew Morton , linux-ext4@vger.kernel.org, linux-erofs@lists.ozlabs.org, ocfs2-devel@oss.oracle.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net 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 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Biggers Date: Fri, 20 Mar 2020 11:52:38 -0700 Subject: [Ocfs2-devel] [PATCH v9 23/25] f2fs: Pass the inode to f2fs_mpage_readpages In-Reply-To: <20200320142231.2402-24-willy@infradead.org> References: <20200320142231.2402-1-willy@infradead.org> <20200320142231.2402-24-willy@infradead.org> Message-ID: <20200320185238.GJ851@sol.localdomain> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ocfs2-devel@oss.oracle.com 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