Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26ddb1f4 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Darrick J. Wong
Browse files

fs: Turn __generic_write_end into a void function 



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: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent dbc582b6

fs/buffer.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

fs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,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);



/*

fs/iomap.c

+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len, 
		ret = __iomap_write_end(inode, pos, len, copied, page, iomap);

	}



	ret = __generic_write_end(inode, pos, ret, page);

	__generic_write_end(inode, pos, ret, page);

	if (iomap->page_done)

		iomap->page_done(inode, pos, copied, page, iomap);