From c38e9b754b5f0ec10669a4a1b9aa3f5c356ea0c9 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Mon, 4 Nov 2019 17:30:07 +0800 Subject: [PATCH 0180/2944] fs: Turn __generic_write_end into a void function commit 26ddb1f4fd884258eeb8a8d7f2d40b163f00fedd upstream The VFS-internal __generic_write_end helper always returns the value of its @copied argument. This can be confusing, and it isn't very useful anyway, so turn __generic_write_end into a function returning void instead. Signed-off-by: Hui Zhu Signed-off-by: Andreas Gruenbacher Reviewed-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Reviewed-by: Joseph Qi --- fs/buffer.c | 6 +++--- fs/internal.h | 2 +- fs/iomap.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index a550e0d..057e718 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2085,7 +2085,7 @@ int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len, } EXPORT_SYMBOL(block_write_begin); -int __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, +void __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, struct page *page) { loff_t old_size = inode->i_size; @@ -2116,7 +2116,6 @@ int __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, */ if (i_size_changed) mark_inode_dirty(inode); - return copied; } int block_write_end(struct file *file, struct address_space *mapping, @@ -2160,7 +2159,8 @@ int generic_write_end(struct file *file, struct address_space *mapping, struct page *page, void *fsdata) { copied = block_write_end(file, mapping, pos, len, copied, page, fsdata); - return __generic_write_end(mapping->host, pos, copied, page); + __generic_write_end(mapping->host, pos, copied, page); + return copied; } EXPORT_SYMBOL(generic_write_end); diff --git a/fs/internal.h b/fs/internal.h index d109665..b2705b6 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -43,7 +43,7 @@ static inline int __sync_blockdev(struct block_device *bdev, int wait) extern void guard_bio_eod(int rw, struct bio *bio); extern int __block_write_begin_int(struct page *page, loff_t pos, unsigned len, get_block_t *get_block, struct iomap *iomap); -int __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, +void __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, struct page *page); /* diff --git a/fs/iomap.c b/fs/iomap.c index 03edf62..f08271c 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -744,7 +744,8 @@ struct iomap_readpage_ctx { iomap_set_range_uptodate(page, offset_in_page(pos), len); iomap_set_page_dirty(page); } - return __generic_write_end(inode, pos, copied, page); + __generic_write_end(inode, pos, copied, page); + return copied; } static int -- 1.8.3.1