Hi everyone,
A friendly bump here.
6.3's merge window is about to begin.
Thanks, regards
On Fri, Feb 3, 2023 at 11:41 AM Juhyung Park <qkrwngud825@xxxxxxxxx> wrote:
>
> bdev_get_queue() never returns NULL. Several commits [1][2] have been made
> before to remove such superfluous checks, but some still remained.
>
> For places where bdev_get_queue() is called solely for NULL checks, it is
> removed entirely.
>
> [1] commit ec9fd2a13d74 ("blk-lib: don't check bdev_get_queue() NULL check")
> [2] commit fea127b36c93 ("block: remove superfluous check for request queue in bdev_is_zoned()")
>
> Signed-off-by: Juhyung Park <qkrwngud825@xxxxxxxxx>
> ---
> block/blk-zoned.c | 10 ----------
> include/linux/blkdev.h | 7 +------
> kernel/trace/blktrace.c | 6 +-----
> 3 files changed, 2 insertions(+), 21 deletions(-)
>
> diff --git a/block/blk-zoned.c b/block/blk-zoned.c
> index 614b575be899..fce9082384d6 100644
> --- a/block/blk-zoned.c
> +++ b/block/blk-zoned.c
> @@ -334,17 +334,12 @@ 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 blk_zone_report rep;
> int ret;
>
> if (!argp)
> return -EINVAL;
>
> - q = bdev_get_queue(bdev);
> - if (!q)
> - return -ENXIO;
> -
> if (!bdev_is_zoned(bdev))
> return -ENOTTY;
>
> @@ -391,7 +386,6 @@ 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 blk_zone_range zrange;
> enum req_op op;
> int ret;
> @@ -399,10 +393,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 (!bdev_is_zoned(bdev))
> return -ENOTTY;
>
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index b9637d63e6f0..89dd9b02b45b 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -1276,12 +1276,7 @@ static inline bool bdev_nowait(struct block_device *bdev)
>
> static inline enum blk_zoned_model bdev_zoned_model(struct block_device *bdev)
> {
> - struct request_queue *q = bdev_get_queue(bdev);
> -
> - if (q)
> - return blk_queue_zoned_model(q);
> -
> - return BLK_ZONED_NONE;
> + return blk_queue_zoned_model(bdev_get_queue(bdev));
> }
>
> static inline bool bdev_is_zoned(struct block_device *bdev)
> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> index 918a7d12df8f..e5e8963d6808 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -729,14 +729,10 @@ EXPORT_SYMBOL_GPL(blk_trace_startstop);
> **/
> int blk_trace_ioctl(struct block_device *bdev, unsigned cmd, char __user *arg)
> {
> - struct request_queue *q;
> + struct request_queue *q = bdev_get_queue(bdev);
> int ret, start = 0;
> char b[BDEVNAME_SIZE];
>
> - q = bdev_get_queue(bdev);
> - if (!q)
> - return -ENXIO;
> -
> mutex_lock(&q->debugfs_mutex);
>
> switch (cmd) {
> --
> 2.39.1
>
