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=-8.5 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT 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 8F21EC43441 for ; Thu, 29 Nov 2018 08:18:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54B17205C9 for ; Thu, 29 Nov 2018 08:18:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54B17205C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-btrfs-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728010AbeK2TXG (ORCPT ); Thu, 29 Nov 2018 14:23:06 -0500 Received: from mx2.suse.de ([195.135.220.15]:33046 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726780AbeK2TXF (ORCPT ); Thu, 29 Nov 2018 14:23:05 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 6F3C1AE8A; Thu, 29 Nov 2018 08:18:28 +0000 (UTC) Date: Thu, 29 Nov 2018 09:18:26 +0100 From: Michal Hocko To: Nikolay Borisov Cc: linux-kernel@vger.kernel.org, David Howells , Chris Mason , Josef Bacik , David Sterba , "Yan, Zheng" , Sage Weil , Ilya Dryomov , Steve French , Theodore Ts'o , Andreas Dilger , Mark Fasheh , Joel Becker , Mike Marshall , Martin Brandenburg , Andrew Morton , Mike Rapoport , Matthew Wilcox , Randy Dunlap , YueHaibing , Shakeel Butt , Dan Williams , linux-afs@lists.infradead.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-ext4@vger.kernel.org, ocfs2-devel@oss.oracle.com, devel@lists.orangefs.org, linux-mm@kvack.org Subject: Re: [PATCH 2/2] fs: Don't open-code lru_to_page Message-ID: <20181129081826.GO6923@dhcp22.suse.cz> References: <20181129075301.29087-1-nborisov@suse.com> <20181129075301.29087-2-nborisov@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181129075301.29087-2-nborisov@suse.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Thu 29-11-18 09:52:57, Nikolay Borisov wrote: > There are a bunch of filesystems which essentially open-code lru_to_page > helper. Change them to using the helper. No functional changes. I would just squash the two into a single patch. It makes the first one more obvious. Or is there any reason to have them separate? > Signed-off-by: Nikolay Borisov Acked-by: Michal Hocko > --- > > Since this is a mostly mechanical change I've actually batched all of them in > a single patch. > > fs/afs/file.c | 5 +++-- > fs/btrfs/extent_io.c | 2 +- > fs/ceph/addr.c | 5 ++--- > fs/cifs/file.c | 3 ++- > fs/ext4/readpage.c | 2 +- > fs/ocfs2/aops.c | 3 ++- > fs/orangefs/inode.c | 2 +- > mm/swap.c | 2 +- > 8 files changed, 13 insertions(+), 11 deletions(-) > > diff --git a/fs/afs/file.c b/fs/afs/file.c > index d6bc3f5d784b..323ae9912203 100644 > --- a/fs/afs/file.c > +++ b/fs/afs/file.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include "internal.h" > > static int afs_file_mmap(struct file *file, struct vm_area_struct *vma); > @@ -441,7 +442,7 @@ static int afs_readpages_one(struct file *file, struct address_space *mapping, > /* Count the number of contiguous pages at the front of the list. Note > * that the list goes prev-wards rather than next-wards. > */ > - first = list_entry(pages->prev, struct page, lru); > + first = lru_to_page(pages); > index = first->index + 1; > n = 1; > for (p = first->lru.prev; p != pages; p = p->prev) { > @@ -473,7 +474,7 @@ static int afs_readpages_one(struct file *file, struct address_space *mapping, > * page at the end of the file. > */ > do { > - page = list_entry(pages->prev, struct page, lru); > + page = lru_to_page(pages); > list_del(&page->lru); > index = page->index; > if (add_to_page_cache_lru(page, mapping, index, > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index 19f4b8fd654f..8332c5f4b1c3 100644 > --- a/fs/btrfs/extent_io.c > +++ b/fs/btrfs/extent_io.c > @@ -4104,7 +4104,7 @@ int extent_readpages(struct address_space *mapping, struct list_head *pages, > u64 prev_em_start = (u64)-1; > > for (page_idx = 0; page_idx < nr_pages; page_idx++) { > - page = list_entry(pages->prev, struct page, lru); > + page = lru_to_page(pages); > > prefetchw(&page->flags); > list_del(&page->lru); > diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c > index 8eade7a993c1..5d0c05e288cc 100644 > --- a/fs/ceph/addr.c > +++ b/fs/ceph/addr.c > @@ -306,7 +306,7 @@ static int start_read(struct inode *inode, struct ceph_rw_context *rw_ctx, > struct ceph_osd_client *osdc = > &ceph_inode_to_client(inode)->client->osdc; > struct ceph_inode_info *ci = ceph_inode(inode); > - struct page *page = list_entry(page_list->prev, struct page, lru); > + struct page *page = lru_to_page(page_list); > struct ceph_vino vino; > struct ceph_osd_request *req; > u64 off; > @@ -333,8 +333,7 @@ static int start_read(struct inode *inode, struct ceph_rw_context *rw_ctx, > if (got) > ceph_put_cap_refs(ci, got); > while (!list_empty(page_list)) { > - page = list_entry(page_list->prev, > - struct page, lru); > + page = lru_to_page(page_list); > list_del(&page->lru); > put_page(page); > } > diff --git a/fs/cifs/file.c b/fs/cifs/file.c > index 74c33d5fafc8..b16a4d887d17 100644 > --- a/fs/cifs/file.c > +++ b/fs/cifs/file.c > @@ -33,6 +33,7 @@ > #include > #include > #include > +#include > #include > #include "cifsfs.h" > #include "cifspdu.h" > @@ -3975,7 +3976,7 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list, > > INIT_LIST_HEAD(tmplist); > > - page = list_entry(page_list->prev, struct page, lru); > + page = lru_to_page(page_list); > > /* > * Lock the page and put it in the cache. Since no one else > diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c > index f461d75ac049..6aa282ee455a 100644 > --- a/fs/ext4/readpage.c > +++ b/fs/ext4/readpage.c > @@ -128,7 +128,7 @@ int ext4_mpage_readpages(struct address_space *mapping, > > prefetchw(&page->flags); > if (pages) { > - page = list_entry(pages->prev, struct page, lru); > + page = lru_to_page(pages); > list_del(&page->lru); > if (add_to_page_cache_lru(page, mapping, page->index, > readahead_gfp_mask(mapping))) > diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c > index eb1ce30412dc..832c1759a09a 100644 > --- a/fs/ocfs2/aops.c > +++ b/fs/ocfs2/aops.c > @@ -30,6 +30,7 @@ > #include > #include > #include > +#include > > #include > > @@ -397,7 +398,7 @@ static int ocfs2_readpages(struct file *filp, struct address_space *mapping, > * Check whether a remote node truncated this file - we just > * drop out in that case as it's not worth handling here. > */ > - last = list_entry(pages->prev, struct page, lru); > + last = lru_to_page(pages); > start = (loff_t)last->index << PAGE_SHIFT; > if (start >= i_size_read(inode)) > goto out_unlock; > diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c > index fe53381b26b1..f038235c64bd 100644 > --- a/fs/orangefs/inode.c > +++ b/fs/orangefs/inode.c > @@ -77,7 +77,7 @@ static int orangefs_readpages(struct file *file, > for (page_idx = 0; page_idx < nr_pages; page_idx++) { > struct page *page; > > - page = list_entry(pages->prev, struct page, lru); > + page = lru_to_page(pages); > list_del(&page->lru); > if (!add_to_page_cache(page, > mapping, > diff --git a/mm/swap.c b/mm/swap.c > index aa483719922e..20b9e9d99652 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -126,7 +126,7 @@ void put_pages_list(struct list_head *pages) > while (!list_empty(pages)) { > struct page *victim; > > - victim = list_entry(pages->prev, struct page, lru); > + victim = lru_to_page(pages); > list_del(&victim->lru); > put_page(victim); > } > -- > 2.17.1 -- Michal Hocko SUSE Labs