Commit 562108d5 authored by Zhang Yi's avatar Zhang Yi Committed by Christian Brauner
Browse files

block: factor out common part in blkdev_fallocate() 



Only the flags passed to blkdev_issue_zeroout() differ among the two
zeroing branches in blkdev_fallocate(). Therefore, do cleanup by
factoring them out.

Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Link: https://lore.kernel.org/20250619111806.3546162-8-yi.zhang@huaweicloud.com


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatar"Martin K. Petersen" <martin.petersen@oracle.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 7bd43cc7

block/fops.c

+14 −18
Original line number Diff line number Diff line
@@ -850,6 +850,7 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, 
	struct block_device *bdev = I_BDEV(inode);

	loff_t end = start + len - 1;

	loff_t isize;

	unsigned int flags;

	int error;



	/* Fail if we don't recognize the flags. */
@@ -877,34 +878,29 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, 
	inode_lock(inode);

	filemap_invalidate_lock(inode->i_mapping);



	/*

	 * Invalidate the page cache, including dirty pages, for valid

	 * de-allocate mode calls to fallocate().

	 */

	switch (mode) {

	case FALLOC_FL_ZERO_RANGE:

	case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE:

		error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end);

		if (error)

			goto fail;



		error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT,

					     len >> SECTOR_SHIFT, GFP_KERNEL,

					     BLKDEV_ZERO_NOUNMAP);

		flags = BLKDEV_ZERO_NOUNMAP;

		break;

	case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE:

		error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end);

		if (error)

			goto fail;



		error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT,

					     len >> SECTOR_SHIFT, GFP_KERNEL,

					     BLKDEV_ZERO_NOFALLBACK);

		flags = BLKDEV_ZERO_NOFALLBACK;

		break;

	default:

		error = -EOPNOTSUPP;

		goto fail;

	}



	/*

	 * Invalidate the page cache, including dirty pages, for valid

	 * de-allocate mode calls to fallocate().

	 */

	error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end);

	if (error)

		goto fail;



	error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT,

				     len >> SECTOR_SHIFT, GFP_KERNEL, flags);

 fail:

	filemap_invalidate_unlock(inode->i_mapping);

	inode_unlock(inode);