On 2021/09/10 11:31, Xu Wang wrote: > 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 <vulab@xxxxxxxxxxx> > --- > block/blk-zoned.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/block/blk-zoned.c b/block/blk-zoned.c > index 1d0c76c18fc5..5160972a009a 100644 > --- a/block/blk-zoned.c > +++ b/block/blk-zoned.c > @@ -354,8 +354,6 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode, > return -EINVAL; > > q = bdev_get_queue(bdev); Please move this together with the q variable declaration: struct request_queue *q = bdev_get_queue(bdev); > - if (!q) > - return -ENXIO; > > if (!blk_queue_is_zoned(q)) > return -ENOTTY; > @@ -412,8 +410,6 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode, > return -EINVAL; > > q = bdev_get_queue(bdev); Same here. > - if (!q) > - return -ENXIO; > > if (!blk_queue_is_zoned(q)) > return -ENOTTY; > With the above changed, this looks good (please at least compile test this !). Reviewed-by: Damien Le Moal <damien.lemoal@xxxxxxx> -- Damien Le Moal Western Digital Research
