Commit 216d1631 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.11-20240830' of git://git.kernel.dk/linux 

Pull block fix from Jens Axboe:
 "Fix for a single regression for WRITE_SAME introduced in the 6.11
  merge window"

* tag 'block-6.11-20240830' of git://git.kernel.dk/linux:
  block: fix detection of unsupported WRITE SAME in blkdev_issue_write_zeroes
parents ad246d9f e33a97a8

block/blk-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int blkdev_issue_write_zeroes(struct block_device *bdev, sector_t sector, 
	 * on an I/O error, in which case we'll turn any error into

	 * "not supported" here.

	 */

	if (ret && !limit)

	if (ret && !bdev_write_zeroes_sectors(bdev))

		return -EOPNOTSUPP;

	return ret;

}