Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / block / blk-lib.c

diff --git a/block/blk-lib.c b/block/blk-lib.c
index 0d1811e57ac704972f383fb4133386af940a71e6..e90614fd8d6a420fad17b34f372deb7c99ea8c22 100644 (file)
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -64,7 +64,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
                return -EINVAL;
 
        /* In case the discard request is in a partition */
-       if (bdev->bd_partno)
+       if (bdev_is_partition(bdev))
                part_offset = bdev->bd_part->start_sect;
 
        while (nr_sects) {