Commit a524fcfe authored by Bean Huo's avatar Bean Huo Committed by Andrew Morton
Browse files

fs: convert block_commit_write to return void 

block_commit_write() always returns 0, this patch changes it to return
void.

Link: https://lkml.kernel.org/r/20230626055518.842392-3-beanhuo@iokpp.de


Signed-off-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Acked-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Luís Henriques <ocfs2-devel@oss.oracle.com>
Cc: Mark Fasheh <mark@fasheh.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 489b7e72

fs/buffer.c

+6 −8
Original line number Diff line number Diff line
@@ -2180,7 +2180,7 @@ int __block_write_begin(struct page *page, loff_t pos, unsigned len, 
}

EXPORT_SYMBOL(__block_write_begin);



static int __block_commit_write(struct folio *folio, size_t from, size_t to)

static void __block_commit_write(struct folio *folio, size_t from, size_t to)

{

	size_t block_start, block_end;

	bool partial = false;
@@ -2215,7 +2215,6 @@ static int __block_commit_write(struct folio *folio, size_t from, size_t to) 
	 */

	if (!partial)

		folio_mark_uptodate(folio);

	return 0;

}



/*
@@ -2596,11 +2595,10 @@ int cont_write_begin(struct file *file, struct address_space *mapping, 
}

EXPORT_SYMBOL(cont_write_begin);



int block_commit_write(struct page *page, unsigned from, unsigned to)

void block_commit_write(struct page *page, unsigned from, unsigned to)

{

	struct folio *folio = page_folio(page);

	__block_commit_write(folio, from, to);

	return 0;

}

EXPORT_SYMBOL(block_commit_write);
@@ -2646,11 +2644,11 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, 
		end = size - folio_pos(folio);



	ret = __block_write_begin_int(folio, 0, end, get_block, NULL);

	if (!ret)

		ret = __block_commit_write(folio, 0, end);



	if (unlikely(ret < 0))

	if (unlikely(ret))

		goto out_unlock;



	__block_commit_write(folio, 0, end);



	folio_mark_dirty(folio);

	folio_wait_stable(folio);

	return 0;

fs/ext4/move_extent.c

+2 −5
Original line number Diff line number Diff line
@@ -392,14 +392,11 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, 
	for (i = 0; i < block_len_in_page; i++) {

		*err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0);

		if (*err < 0)

			break;

			goto repair_branches;

		bh = bh->b_this_page;

	}

	if (!*err)

		*err = block_commit_write(&folio[0]->page, from, from + replaced_size);



	if (unlikely(*err < 0))

		goto repair_branches;

	block_commit_write(&folio[0]->page, from, from + replaced_size);



	/* Even in case of data=writeback it is reasonable to pin

	 * inode to transaction, to prevent unexpected data loss */

fs/ocfs2/file.c

+1 −6
Original line number Diff line number Diff line
@@ -808,12 +808,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from, 




		/* must not update i_size! */

		ret = block_commit_write(page, block_start + 1,

					 block_start + 1);

		if (ret < 0)

			mlog_errno(ret);

		else

			ret = 0;

		block_commit_write(page, block_start + 1, block_start + 1);

	}



	/*

fs/udf/file.c

+3 −3
Original line number Diff line number Diff line
@@ -63,13 +63,13 @@ static vm_fault_t udf_page_mkwrite(struct vm_fault *vmf) 
	else

		end = PAGE_SIZE;

	err = __block_write_begin(page, 0, end, udf_get_block);

	if (!err)

		err = block_commit_write(page, 0, end);

	if (err < 0) {

	if (err) {

		unlock_page(page);

		ret = block_page_mkwrite_return(err);

		goto out_unlock;

	}



	block_commit_write(page, 0, end);

out_dirty:

	set_page_dirty(page);

	wait_for_stable_page(page);

include/linux/buffer_head.h

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ int cont_write_begin(struct file *, struct address_space *, loff_t, 
			unsigned, struct page **, void **,

			get_block_t *, loff_t *);

int generic_cont_expand_simple(struct inode *inode, loff_t size);

int block_commit_write(struct page *page, unsigned from, unsigned to);

void block_commit_write(struct page *page, unsigned int from, unsigned int to);

int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,

				get_block_t get_block);

/* Convert errno to return value from ->page_mkwrite() call */