diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-03-13 07:33:48 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-03-13 07:33:48 +0100 |
| commit | de69d56daac6d9b98fa384184078751db1288144 (patch) | |
| tree | b95ab78aa8d55bfc9a08990097594125c13f0614 /include/linux/blkdev.h | |
| parent | b11a74ac4f545626d0dc95a8ca8c41df90532bf3 (diff) | |
| parent | 658fb7fe8e7f4014ea17a4da0e0c1d9bc319fa35 (diff) | |
Merge tag 'asoc-fix-v6.14-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.14
The bulk of this is driver specific fixes, mostly unremarkable. There's
also one core fix from Charles, fixing up confusion around the limiting
of maximum control values.
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 248416ecd01c..d37751789bf5 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -196,10 +196,11 @@ struct gendisk { unsigned int zone_capacity; unsigned int last_zone_capacity; unsigned long __rcu *conv_zones_bitmap; - unsigned int zone_wplugs_hash_bits; - spinlock_t zone_wplugs_lock; + unsigned int zone_wplugs_hash_bits; + atomic_t nr_zone_wplugs; + spinlock_t zone_wplugs_lock; struct mempool_s *zone_wplugs_pool; - struct hlist_head *zone_wplugs_hash; + struct hlist_head *zone_wplugs_hash; struct workqueue_struct *zone_wplugs_wq; #endif /* CONFIG_BLK_DEV_ZONED */ @@ -367,6 +368,7 @@ struct queue_limits { unsigned int max_sectors; unsigned int max_user_sectors; unsigned int max_segment_size; + unsigned int min_segment_size; unsigned int physical_block_size; unsigned int logical_block_size; unsigned int alignment_offset; |