Commit 4ee22162 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.6-2023-10-12' of git://git.kernel.dk/linux 

Pull block fix from Jens Axboe:
 "Just a single fix for a longstanding regression with using fallocate
  on a block device"

* tag 'block-6.6-2023-10-12' of git://git.kernel.dk/linux:
  block: Don't invalidate pagecache for invalid falloc modes
parents 20f4757f 1364a3c3

block/fops.c

+16 −5
Original line number Diff line number Diff line
@@ -772,24 +772,35 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, 


	filemap_invalidate_lock(inode->i_mapping);



	/* Invalidate the page cache, including dirty pages. */

	/*

	 * 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;



	switch (mode) {

	case FALLOC_FL_ZERO_RANGE:

	case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE:

		error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT,

					     len >> SECTOR_SHIFT, GFP_KERNEL,

					     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);

		break;

	case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE:

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

		if (error)

			goto fail;



		error = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT,

					     len >> SECTOR_SHIFT, GFP_KERNEL);

		break;