]> www.infradead.org Git - nvme.git/commitdiff
block: Drop NULL check in bdev_write_zeroes_sectors()
authorJohn Garry <john.g.garry@oracle.com>
Thu, 15 Aug 2024 16:32:28 +0000 (16:32 +0000)
committerJens Axboe <axboe@kernel.dk>
Mon, 19 Aug 2024 15:48:59 +0000 (09:48 -0600)
Function bdev_get_queue() must not return NULL, so drop the check in
bdev_write_zeroes_sectors().

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Nitesh Shetty <nj.shetty@samsung.com>
Link: https://lore.kernel.org/r/20240815163228.216051-3-john.g.garry@oracle.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
include/linux/blkdev.h

index e85ec73a07d575e13caf1f5f3639fd957b54200b..b7664d593486a8b56597fea32aa2c7ad4aeb2bbb 100644 (file)
@@ -1296,12 +1296,7 @@ bdev_max_secure_erase_sectors(struct block_device *bdev)
 
 static inline unsigned int bdev_write_zeroes_sectors(struct block_device *bdev)
 {
-       struct request_queue *q = bdev_get_queue(bdev);
-
-       if (q)
-               return q->limits.max_write_zeroes_sectors;
-
-       return 0;
+       return bdev_get_queue(bdev)->limits.max_write_zeroes_sectors;
 }
 
 static inline bool bdev_nonrot(struct block_device *bdev)