Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f2b18ec authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

bcache: Fix a compiler warning in bcache_device_init() 



Avoid that building with W=1 triggers the following compiler warning:

drivers/md/bcache/super.c:776:20: warning: comparison is always false due to limited range of data type [-Wtype-limits]
      d->nr_stripes > SIZE_MAX / sizeof(atomic_t)) {
                    ^

Reviewed-by: default avatarColy Li <colyli@suse.de>
Reviewed-by: default avatarMichael Lyle <mlyle@lyle.org>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 20d3a518

drivers/md/bcache/super.c

+3 −3
Original line number Diff line number Diff line
@@ -778,6 +778,8 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size, 
			      sector_t sectors)

{

	struct request_queue *q;

	const size_t max_stripes = min_t(size_t, INT_MAX,

					 SIZE_MAX / sizeof(atomic_t));

	size_t n;

	int idx;
@@ -786,9 +788,7 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size, 


	d->nr_stripes = DIV_ROUND_UP_ULL(sectors, d->stripe_size);



	if (!d->nr_stripes ||

	    d->nr_stripes > INT_MAX ||

	    d->nr_stripes > SIZE_MAX / sizeof(atomic_t)) {

	if (!d->nr_stripes || d->nr_stripes > max_stripes) {

		pr_err("nr_stripes too large or invalid: %u (start sector beyond end of disk?)",

			(unsigned)d->nr_stripes);

		return -ENOMEM;