block: stop setting the nomerges flags in blk_cleanup_queue
authorChristoph Hellwig <hch@lst.de>
Sun, 19 Jun 2022 06:05:50 +0000 (08:05 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 28 Jun 2022 12:30:26 +0000 (06:30 -0600)
commit0e3534022f26ae51f7cf28347a253230604b6f4e
tree8289b2d55fc88d64161d8cf9107763634452a596
parent1f90307e5f0d7bc9a336ead528f616a5df8e5944
block: stop setting the nomerges flags in blk_cleanup_queue

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>
block/blk-core.c