]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
bcache: Fix a compiler warning in bcache_device_init()
authorBart Van Assche <bart.vanassche@wdc.com>
Mon, 19 Mar 2018 00:36:33 +0000 (17:36 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 19 Mar 2018 02:15:20 +0000 (20:15 -0600)
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: Coly Li <colyli@suse.de>
Reviewed-by: Michael Lyle <mlyle@lyle.org>
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/md/bcache/super.c

index 06f4b4833755d02348f8cf04c626e29febc26f32..a21694788619b75b607125386b3ba50956bbde0d 100644 (file)
@@ -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;