]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
dm zoned: Silence a static checker warning
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 10 Apr 2019 08:12:31 +0000 (11:12 +0300)
committerMike Snitzer <snitzer@redhat.com>
Thu, 18 Apr 2019 20:16:01 +0000 (16:16 -0400)
My static checker complains about this line from dmz_get_zoned_device()

aligned_capacity = dev->capacity & ~(blk_queue_zone_sectors(q) - 1);

The problem is that "aligned_capacity" and "dev->capacity" are sector_t
type (which is a u64 under most configs) but blk_queue_zone_sectors(q)
returns a u32 so the higher 32 bits in aligned_capacity are cleared to
zero.  This patch adds a cast to address the issue.

Fixes: 114e025968b5 ("dm zoned: ignore last smaller runt zone")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
drivers/md/dm-zoned-target.c

index 8865c1709e16357178ede5284c4477536bf2369d..51d029bbb740c4f032ea63005611b194fcc5cee8 100644 (file)
@@ -643,7 +643,8 @@ static int dmz_get_zoned_device(struct dm_target *ti, char *path)
 
        q = bdev_get_queue(dev->bdev);
        dev->capacity = i_size_read(dev->bdev->bd_inode) >> SECTOR_SHIFT;
-       aligned_capacity = dev->capacity & ~(blk_queue_zone_sectors(q) - 1);
+       aligned_capacity = dev->capacity &
+                               ~((sector_t)blk_queue_zone_sectors(q) - 1);
        if (ti->begin ||
            ((ti->len != dev->capacity) && (ti->len != aligned_capacity))) {
                ti->error = "Partial mapping not supported";