diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-31 13:54:05 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-31 13:54:05 +1200 |
| commit | 216d163165a937ee9c1d0e9c26fe7a6f7d27ac4c (patch) | |
| tree | 8342f4e69d54ea2383ecd63d22f62c81f0a73d18 | |
| parent | ad246d9f04aa037f8e8bbf8573c9af527114cead (diff) | |
| parent | e33a97a830b230b79a98dbbb4121d4741a2be619 (diff) | |
| download | lwn-216d163165a937ee9c1d0e9c26fe7a6f7d27ac4c.tar.gz lwn-216d163165a937ee9c1d0e9c26fe7a6f7d27ac4c.zip | |
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
| -rw-r--r-- | block/blk-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-lib.c b/block/blk-lib.c index 83eb7761c2bf..4c9f20a689f7 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -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; } |