lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 018/207] block: stop setting the nomerges flags in blk_cleanup_queue
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ Upstream commit 0e3534022f26ae51f7cf28347a253230604b6f4e ]

    These flags only apply to file system I/O, and all file system I/O is
    already drained by del_gendisk and thus can't be in progress when
    blk_cleanup_queue is called.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Hannes Reinecke <hare@suse.de>
    Link: https://lore.kernel.org/r/20220619060552.1850436-5-hch@lst.de
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Stable-dep-of: 8fe4ce5836e9 ("scsi: core: Fix a use-after-free")
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    block/blk-core.c | 3 ---
    1 file changed, 3 deletions(-)

    diff --git a/block/blk-core.c b/block/blk-core.c
    index 76f070c3a3b0..b8083decc07f 100644
    --- a/block/blk-core.c
    +++ b/block/blk-core.c
    @@ -304,9 +304,6 @@ void blk_cleanup_queue(struct request_queue *q)
    blk_queue_flag_set(QUEUE_FLAG_DYING, q);
    blk_queue_start_drain(q);

    - blk_queue_flag_set(QUEUE_FLAG_NOMERGES, q);
    - blk_queue_flag_set(QUEUE_FLAG_NOXMERGES, q);
    -
    /*
    * Drain all requests queued before DYING marking. Set DEAD flag to
    * prevent that blk_mq_run_hw_queues() accesses the hardware queues
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-26 13:41    [W:4.228 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site