The request_queue pointer returned from bdev_get_queue() shall
never be NULL, so the NULL checks are unnecessary, just remove them.
Signed-off-by: Xu Wang <[email protected]>
Reported-by: kernel test robot <[email protected]>
Changes since v2:
- Make the q variable assignment together with declaration.
Changes since v3:
- Fix error function use reported by kernel test robot.
---
block/blk-zoned.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 1d0c76c18fc5..b797e24d4aa3 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -346,17 +346,13 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode,
{
void __user *argp = (void __user *)arg;
struct zone_report_args args;
- struct request_queue *q;
+ struct request_queue *q = bdev_get_queue(bdev);
struct blk_zone_report rep;
int ret;
if (!argp)
return -EINVAL;
- q = bdev_get_queue(bdev);
- if (!q)
- return -ENXIO;
-
if (!blk_queue_is_zoned(q))
return -ENOTTY;
@@ -403,7 +399,7 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
void __user *argp = (void __user *)arg;
- struct request_queue *q;
+ struct request_queue *q = bdev_get_queue(bdev);
struct blk_zone_range zrange;
enum req_opf op;
int ret;
@@ -411,10 +407,6 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode,
if (!argp)
return -EINVAL;
- q = bdev_get_queue(bdev);
- if (!q)
- return -ENXIO;
-
if (!blk_queue_is_zoned(q))
return -ENOTTY;
--
2.17.1