Merge branch 'for-6.11/block' into for-next

axboe · axboe · commit 857b2572a240 · 2024-06-28T10:25:08.000-06:00
* for-6.11/block:
  bcache: work around a __bitwise to bool conversion sparse warning
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
@@ -1416,8 +1416,8 @@ static int cached_dev_init(struct cached_dev *dc, unsigned int block_size)
 	}
 
 	if (bdev_io_opt(dc->bdev))
-		dc->partial_stripes_expensive = q->limits.features &
-			BLK_FEAT_RAID_PARTIAL_STRIPES_EXPENSIVE;
+		dc->partial_stripes_expensive = !!(q->limits.features &
+			BLK_FEAT_RAID_PARTIAL_STRIPES_EXPENSIVE);
 
 	ret = bcache_device_init(&dc->disk, block_size,
 			 bdev_nr_sectors(dc->bdev) - dc->sb.data_offset,

Original file line number	Diff line number	Diff line change
`@@ -1416,8 +1416,8 @@ static int cached_dev_init(struct cached_dev *dc, unsigned int block_size)`
`1416`	`1416`	`}`
`1417`	`1417`
`1418`	`1418`	`if (bdev_io_opt(dc->bdev))`
`1419`		`- dc->partial_stripes_expensive = q->limits.features &`
`1420`		`- BLK_FEAT_RAID_PARTIAL_STRIPES_EXPENSIVE;`
	`1419`	`+ dc->partial_stripes_expensive = !!(q->limits.features &`
	`1420`	`+ BLK_FEAT_RAID_PARTIAL_STRIPES_EXPENSIVE);`
`1421`	`1421`
`1422`	`1422`	`ret = bcache_device_init(&dc->disk, block_size,`
`1423`	`1423`	`bdev_nr_sectors(dc->bdev) - dc->sb.data_offset,`