From: Jérôme Glisse <jgli...@redhat.com> 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 <jgli...@redhat.com> Cc: Jens Axboe <ax...@kernel.dk> CC: Andrew Morton <a...@linux-foundation.org> Cc: Alexander Viro <v...@zeniv.linux.org.uk> Cc: linux-fsde...@vger.kernel.org Cc: Tejun Heo <t...@kernel.org> Cc: Jan Kara <j...@suse.cz> Cc: Josef Bacik <jba...@fb.com> Cc: Mel Gorman <mgor...@techsingularity.net> --- 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