diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-31 22:57:19 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-31 22:57:19 +0300 |
| commit | a5beb58e53092f77b89181bec9d30c8bdced3103 (patch) | |
| tree | 0479fb55c5b28b32d877a9a6663ba771fd641539 /block | |
| parent | b4f7f01ea14fe3654a0f7b7152ded7c15acd5e5f (diff) | |
| parent | 0d92a3eaa6726e64a18db74ece806c2c021aaac3 (diff) | |
| download | linux-a5beb58e53092f77b89181bec9d30c8bdced3103.tar.xz | |
Merge tag 'block-6.18-20251031' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux
Pull block fixes from Jens Axboe:
- Fix blk-crypto reporting EIO when EINVAL is the correct error code
- Two bug fixes for the block zone support
- NVME pull request via Keith:
- Target side authentication fixup
- Peer-to-peer metadata fixup
- null_blk DMA alignment fix
* tag 'block-6.18-20251031' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
null_blk: set dma alignment to logical block size
blk-crypto: use BLK_STS_INVAL for alignment errors
block: make REQ_OP_ZONE_OPEN a write operation
block: fix op_is_zone_mgmt() to handle REQ_OP_ZONE_RESET_ALL
nvme-pci: use blk_map_iter for p2p metadata
nvmet-auth: update sc_c in host response
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-crypto.c b/block/blk-crypto.c index 4b1ad84d1b5a..3e7bf1974cbd 100644 --- a/block/blk-crypto.c +++ b/block/blk-crypto.c @@ -292,7 +292,7 @@ bool __blk_crypto_bio_prep(struct bio **bio_ptr) } if (!bio_crypt_check_alignment(bio)) { - bio->bi_status = BLK_STS_IOERR; + bio->bi_status = BLK_STS_INVAL; goto fail; } |