Commit 2ba39cc4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

fs: rename and move block_page_mkwrite_return 



block_page_mkwrite_return is neither block nor mkwrite specific, and
should not be under CONFIG_BLOCK.  Move it to mm.h and rename it to
vmf_fs_error.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20230801172201.1923299-3-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4a8b719f

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -6140,7 +6140,7 @@ vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf) 
	if (err == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))

		goto retry_alloc;

out_ret:

	ret = block_page_mkwrite_return(err);

	ret = vmf_fs_error(err);

out:

	filemap_invalidate_unlock_shared(mapping);

	sb_end_pagefault(inode->i_sb);

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) 


	sb_end_pagefault(inode->i_sb);

err:

	return block_page_mkwrite_return(err);

	return vmf_fs_error(err);

}



static const struct vm_operations_struct f2fs_file_vm_ops = {

fs/gfs2/file.c

+8 −8
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf) 
	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);

	err = gfs2_glock_nq(&gh);

	if (err) {

		ret = block_page_mkwrite_return(err);

		ret = vmf_fs_error(err);

		goto out_uninit;

	}
@@ -474,7 +474,7 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf) 


	err = gfs2_rindex_update(sdp);

	if (err) {

		ret = block_page_mkwrite_return(err);

		ret = vmf_fs_error(err);

		goto out_unlock;

	}
@@ -482,12 +482,12 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf) 
	ap.target = data_blocks + ind_blocks;

	err = gfs2_quota_lock_check(ip, &ap);

	if (err) {

		ret = block_page_mkwrite_return(err);

		ret = vmf_fs_error(err);

		goto out_unlock;

	}

	err = gfs2_inplace_reserve(ip, &ap);

	if (err) {

		ret = block_page_mkwrite_return(err);

		ret = vmf_fs_error(err);

		goto out_quota_unlock;

	}
@@ -500,7 +500,7 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf) 
	}

	err = gfs2_trans_begin(sdp, rblocks, 0);

	if (err) {

		ret = block_page_mkwrite_return(err);

		ret = vmf_fs_error(err);

		goto out_trans_fail;

	}
@@ -508,7 +508,7 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf) 
	if (gfs2_is_stuffed(ip)) {

		err = gfs2_unstuff_dinode(ip);

		if (err) {

			ret = block_page_mkwrite_return(err);

			ret = vmf_fs_error(err);

			goto out_trans_end;

		}

	}
@@ -524,7 +524,7 @@ static vm_fault_t gfs2_page_mkwrite(struct vm_fault *vmf) 


	err = gfs2_allocate_page_backing(page, length);

	if (err)

		ret = block_page_mkwrite_return(err);

		ret = vmf_fs_error(err);



out_page_locked:

	if (ret != VM_FAULT_LOCKED)
@@ -558,7 +558,7 @@ static vm_fault_t gfs2_fault(struct vm_fault *vmf) 
	gfs2_holder_init(ip->i_gl, LM_ST_SHARED, 0, &gh);

	err = gfs2_glock_nq(&gh);

	if (err) {

		ret = block_page_mkwrite_return(err);

		ret = vmf_fs_error(err);

		goto out_uninit;

	}

	ret = filemap_fault(vmf);

fs/iomap/buffered-io.c

+1 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops) 
	return VM_FAULT_LOCKED;

out_unlock:

	folio_unlock(folio);

	return block_page_mkwrite_return(ret);

	return vmf_fs_error(ret);

}

EXPORT_SYMBOL_GPL(iomap_page_mkwrite);

fs/nilfs2/file.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf) 
	wait_for_stable_page(page);

 out:

	sb_end_pagefault(inode->i_sb);

	return block_page_mkwrite_return(ret);

	return vmf_fs_error(ret);

}



static const struct vm_operations_struct nilfs_file_vm_ops = {