Skip to content

Commit 216d163

Browse files
committed
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
2 parents ad246d9 + e33a97a commit 216d163

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

block/blk-lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static int blkdev_issue_write_zeroes(struct block_device *bdev, sector_t sector,
174174
* on an I/O error, in which case we'll turn any error into
175175
* "not supported" here.
176176
*/
177-
if (ret && !limit)
177+
if (ret && !bdev_write_zeroes_sectors(bdev))
178178
return -EOPNOTSUPP;
179179
return ret;
180180
}

0 commit comments

Comments
 (0)