History

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

Linus Torvalds committed 1 year ago

Commit a5beb582 parents b4f7f01 0d92a3e5 files · +21 −11Browse files

Showing the changes to include/linux (1 of 5 files). Show all

Unified · Split

include/linux/blk_types.h+6−5
@@ -341,15 +341,15 @@ enum req_op { · 340 unmodified lines
341341 /* write the zero filled sector many times */
342342 REQ_OP_WRITE_ZEROES = (__force blk_opf_t)9,
343343 /* Open a zone */
344− REQ_OP_ZONE_OPEN = (__force blk_opf_t)10,
344+ REQ_OP_ZONE_OPEN = (__force blk_opf_t)11,
345345 /* Close a zone */
346− REQ_OP_ZONE_CLOSE = (__force blk_opf_t)11,
346+ REQ_OP_ZONE_CLOSE = (__force blk_opf_t)13,
347347 /* Transition a zone to full */
348− REQ_OP_ZONE_FINISH = (__force blk_opf_t)13,
348+ REQ_OP_ZONE_FINISH = (__force blk_opf_t)15,
349349 /* reset a zone write pointer */
350− REQ_OP_ZONE_RESET = (__force blk_opf_t)15,
350+ REQ_OP_ZONE_RESET = (__force blk_opf_t)17,
351351 /* reset all the zone present on the device */
352− REQ_OP_ZONE_RESET_ALL = (__force blk_opf_t)17,
352+ REQ_OP_ZONE_RESET_ALL = (__force blk_opf_t)19,
353353
354354 /* Driver private requests */
355355 REQ_OP_DRV_IN = (__force blk_opf_t)34,
@@ -478,6 +478,7 @@ static inline bool op_is_zone_mgmt(enum req_op op) · 122 unmodified lines
478478 {
479479 switch (op & REQ_OP_MASK) {
480480 case REQ_OP_ZONE_RESET:
481+ case REQ_OP_ZONE_RESET_ALL:
481482 case REQ_OP_ZONE_OPEN:
482483 case REQ_OP_ZONE_CLOSE:
483484 case REQ_OP_ZONE_FINISH:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t