From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk0-f199.google.com (mail-qk0-f199.google.com [209.85.220.199]) by kanga.kvack.org (Postfix) with ESMTP id 2D6366B026D for ; Wed, 4 Apr 2018 15:19:23 -0400 (EDT) Received: by mail-qk0-f199.google.com with SMTP id v74so15497743qkl.9 for ; Wed, 04 Apr 2018 12:19:23 -0700 (PDT) Received: from mx1.redhat.com (mx3-rdu2.redhat.com. [66.187.233.73]) by mx.google.com with ESMTPS id c48si4111948qtd.166.2018.04.04.12.19.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 12:19:22 -0700 (PDT) From: jglisse@redhat.com 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: 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 From: JA(C)rA'me Glisse Add struct address_space to clean_page_buffers() arguments. One step toward dropping reliance on page->mapping. Signed-off-by: JA(C)rA'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 *); -- 2.14.3