From patchwork Wed Apr 4 19:18:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 10323175 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1016C60390 for ; Wed, 4 Apr 2018 19:25:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0112D28EA8 for ; Wed, 4 Apr 2018 19:25:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5E2828F55; Wed, 4 Apr 2018 19:25:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C71728EA8 for ; Wed, 4 Apr 2018 19:25:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752295AbeDDTZ0 (ORCPT ); Wed, 4 Apr 2018 15:25:26 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54028 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752023AbeDDTTW (ORCPT ); Wed, 4 Apr 2018 15:19:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 127504072CFC; Wed, 4 Apr 2018 19:19:22 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-125-89.rdu2.redhat.com [10.10.125.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C0FE94580; Wed, 4 Apr 2018 19:19:21 +0000 (UTC) From: jglisse@redhat.com To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jens Axboe , Andrew Morton , Alexander Viro , Tejun Heo , Jan Kara , Josef Bacik , Mel Gorman Subject: [RFC PATCH 39/79] fs/buffer: add struct address_space to clean_page_buffers() arguments Date: Wed, 4 Apr 2018 15:18:13 -0400 Message-Id: <20180404191831.5378-24-jglisse@redhat.com> In-Reply-To: <20180404191831.5378-1-jglisse@redhat.com> References: <20180404191831.5378-1-jglisse@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 04 Apr 2018 19:19:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 04 Apr 2018 19:19:22 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jglisse@redhat.com' RCPT:'' Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jérôme Glisse Add struct address_space to clean_page_buffers() arguments. One step toward dropping reliance on page->mapping. Signed-off-by: Jérôme Glisse Cc: Jens Axboe CC: Andrew Morton Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Cc: Tejun Heo Cc: Jan Kara Cc: Josef Bacik Cc: Mel Gorman --- fs/block_dev.c | 2 +- fs/mpage.c | 9 +++++---- include/linux/buffer_head.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index dd9da97615e3..b653cd8fd1e3 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -712,7 +712,7 @@ int bdev_write_page(struct block_device *bdev, sector_t sector, if (result) { end_page_writeback(page); } else { - clean_page_buffers(page); + clean_page_buffers(mapping, page); unlock_page(page); } blk_queue_exit(bdev->bd_queue); diff --git a/fs/mpage.c b/fs/mpage.c index a75cea232f1a..624995c333e0 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -447,7 +447,8 @@ struct mpage_data { * We have our BIO, so we can now mark the buffers clean. Make * sure to only clean buffers which we know we'll be writing. */ -static void clean_buffers(struct page *page, unsigned first_unmapped) +static void clean_buffers(struct address_space *mapping, struct page *page, + unsigned first_unmapped) { unsigned buffer_counter = 0; struct buffer_head *bh, *head; @@ -477,9 +478,9 @@ static void clean_buffers(struct page *page, unsigned first_unmapped) * We don't need to calculate how many buffers are attached to the page, * we just need to specify a number larger than the maximum number of buffers. */ -void clean_page_buffers(struct page *page) +void clean_page_buffers(struct address_space *mapping, struct page *page) { - clean_buffers(page, ~0U); + clean_buffers(mapping, page, ~0U); } static int __mpage_writepage(struct page *page, struct address_space *_mapping, @@ -643,7 +644,7 @@ static int __mpage_writepage(struct page *page, struct address_space *_mapping, goto alloc_new; } - clean_buffers(page, first_unmapped); + clean_buffers(mapping, page, first_unmapped); BUG_ON(PageWriteback(page)); set_page_writeback(page); diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 22e79307c055..f3baf88a251b 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -248,7 +248,7 @@ int generic_write_end(struct file *, struct address_space *, loff_t, unsigned, unsigned, struct page *, void *); void page_zero_new_buffers(struct page *page, unsigned from, unsigned to); -void clean_page_buffers(struct page *page); +void clean_page_buffers(struct address_space *mapping, struct page *page); int cont_write_begin(struct file *, struct address_space *, loff_t, unsigned, unsigned, struct page **, void **, get_block_t *, loff_t *);