History

Merge tag 'block-6.7-2023-12-01' of git://git.kernel.dk/linux

Pull block fixes from Jens Axboe: - NVMe pull request via Keith: - Invalid namespace identification error handling (Marizio Ewan, Keith) - Fabrics keep-alive tuning (Mark) - Fix for a bad error check regression in bcache (Markus) - Fix for a performance regression with O_DIRECT (Ming) - Fix for a flush related deadlock (Ming) - Make the read-only warn on per-partition (Yu) * tag 'block-6.7-2023-12-01' of git://git.kernel.dk/linux: nvme-core: check for too small lba shift blk-mq: don't count completed flush data request as inflight in case of quiesce block: Document the role of the two attribute groups block: warn once for each partition in bio_check_ro() block: move .bd_inode into 1st cacheline of block_device nvme: check for valid nvme_identify_ns() before using it nvme-core: fix a memory leak in nvme_ns_info_from_identify() nvme: fine-tune sending of first keep-alive bcache: revert replacing IS_ERR_OR_NULL with IS_ERR

Linus Torvalds committed 2 years ago

Commit ee0c8a92 parents abd792f 8ad3ac96 files · +58 −12Browse files

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

Unified · Split

include/linux/blk_types.h+3−1
@@ -49,9 +49,10 @@ struct block_device { · 48 unmodified lines
4949 bool bd_write_holder;
5050 bool bd_has_submit_bio;
5151 dev_t bd_dev;
52+ struct inode *bd_inode; /* will die */
53+
5254 atomic_t bd_openers;
5355 spinlock_t bd_size_lock; /* for bd_inode->i_size updates */
54− struct inode * bd_inode; /* will die */
5556 void * bd_claiming;
5657 void * bd_holder;
5758 const struct blk_holder_ops *bd_holder_ops;
@@ -69,6 +70,7 @@ struct block_device { · 11 unmodified lines
6970 #ifdef CONFIG_FAIL_MAKE_REQUEST
7071 bool bd_make_it_fail;
7172 #endif
73+ bool bd_ro_warned;
7274 /*
7375 * keep this out-of-line as it's both big and not needed in the fast
7476 * path

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