diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-02-06 15:18:14 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-02-06 15:19:00 -0800 |
| commit | ba6ec09911b805778a2fed6d626bfe77b011a717 (patch) | |
| tree | 051fa81966585531550c9cae3e638f87e9f281ea /include/linux/blkdev.h | |
| parent | 0bdcfaf84a9428c49f971be9024505b9e3b43038 (diff) | |
| parent | 3cf0a98fea776adb09087e521fe150c295a4b031 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.14-rc2).
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 76f0a4e7c2e5..248416ecd01c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -561,7 +561,6 @@ struct request_queue { struct list_head flush_list; struct mutex sysfs_lock; - struct mutex sysfs_dir_lock; struct mutex limits_lock; /* @@ -605,8 +604,6 @@ struct request_queue { * Serializes all debugfs metadata operations using the above dentries. */ struct mutex debugfs_mutex; - - bool mq_sysfs_init_done; }; /* Keep blk_queue_flag_name[] in sync with the definitions below */ |