From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 31/79] fs/block: add struct address_space to __block_write_begin_int() args Date: Wed, 4 Apr 2018 15:18:05 -0400 Message-Id: <20180404191831.5378-16-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: From: Jérôme Glisse Add struct address_space to __block_write_begin_int() arguments. One step toward dropping reliance on page->mapping. ---------------------------------------------------------------------- @exists@ identifier M; expression E1, E2, E3, E4, E5; @@ struct address_space *M; ... -__block_write_begin_int(E1, E2, E3, E4, E5) +__block_write_begin_int(M, E1, E2, E3, E4, E5) @exists@ identifier M, F; expression E1, E2, E3, E4, E5; @@ F(..., struct address_space *M, ...) {... -__block_write_begin_int(E1, E2, E3, E4, E5) +__block_write_begin_int(M, E1, E2, E3, E4, E5) ...} ---------------------------------------------------------------------- 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/buffer.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index de16588d7f7f..c83878d0a4c0 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1943,8 +1943,9 @@ iomap_to_bh(struct inode *inode, sector_t block, struct buffer_head *bh, } } -int __block_write_begin_int(struct page *page, loff_t pos, unsigned len, - get_block_t *get_block, struct iomap *iomap) +int __block_write_begin_int(struct address_space *mapping, struct page *page, + loff_t pos, unsigned len, get_block_t *get_block, + struct iomap *iomap) { unsigned from = pos & (PAGE_SIZE - 1); unsigned to = from + len; @@ -2031,7 +2032,8 @@ int __block_write_begin_int(struct page *page, loff_t pos, unsigned len, int __block_write_begin(struct address_space *mapping, struct page *page, loff_t pos, unsigned len, get_block_t *get_block) { - return __block_write_begin_int(page, pos, len, get_block, NULL); + return __block_write_begin_int(mapping, page, pos, len, get_block, + NULL); } EXPORT_SYMBOL(__block_write_begin); -- 2.14.3