block-6.11-20240830

-----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmbSK5QQHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgppCNEACKzt/1O3DFYe4AscV3xdaFXs0TpmRzkg7C
 XvrxnxzWrVrlsO+hlgN1dITCcwo5kb1ulKr6Z2PbQE2xGdNlqXN9nd/oZ6OJYJDe
 CAdlzrY/YxtT0qKkZjMe0ADRDtQDfoeTR++CfgmxCviyy1fMgGb3YiMnyVleS8D3
 mHbqZZFkiIt6poIv4YZEuDrUdVEEBr7kZx805oYu5s6VlTT9N2p89xjPmV4ebUi4
 gDKCnlnDGXJ/SEqzuSnhM5fDC6uGc4h1LtsRsoKAVwv0CW6U94Z+ne8bkqDa1QsX
 AsufFPKvGnJn8eNh0PqXr1ZkWxL1NzUt/zL2wfDd97DGM5M5HFaBFg/gXo5xNmWa
 fQheSvhxqOnIq5Jj6kPj3aOJiGpJhFzxwQ4JhmOA9QUBMvBG8Odl/CA4ZKdPTaOC
 zTcGUyWDw5z0bmwjW/EMcwUcteVX+1hg6BqQWiEret6PJf76I7+Mj/1ZNkpsmxDA
 zndQ6BsS/vgqnTAJFjk92Uw3doJcs0DJcYPkk4jbFJWPODBhqm2id7qJtvBsRmrD
 2IP8/9sAIgcXTdDvOPr6LNAyONPfpE0ya0gGi4xzKlsXnDaO+HTDNdeMKNMWkY+O
 U7uoi5OZfgC/6XLaaZETEH332LEPEdXeaFRRfBzy8OqsTIM4fSXmtYhaRt0vXuUC
 t0N2fW5jdw==
 =Wgk4
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-08-31 13:54:05 +12:00
commit 216d163165

View File

@ -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;
}