mpt3sas_scsih: don't set QUEUE_FLAG_NOMERGES

Setting QUEUE_FLAG_NOMERGES was added in commit d1b01d14b7ba ("scsi:
mpt3sas: Set NVMe device queue depth as 128") without any explanation.
Drivers should second guess the block layer merge decisions, so remove
the flag.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240627124926.512662-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 12d08d8ba5382d626d25ab9f7e6578e6ca0c84e1..b050aedc9d433435d59d309a8464d37017440206 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2680,12 +2680,6 @@ scsih_device_configure(struct scsi_device *sdev, struct queue_limits *lim)
                pcie_device_put(pcie_device);
                spin_unlock_irqrestore(&ioc->pcie_device_lock, flags);
                mpt3sas_scsih_change_queue_depth(sdev, qdepth);
-               /* Enable QUEUE_FLAG_NOMERGES flag, so that IOs won't be
-                ** merged and can eliminate holes created during merging
-                ** operation.
-                **/
-               blk_queue_flag_set(QUEUE_FLAG_NOMERGES,
-                               sdev->request_queue);
                lim->virt_boundary_mask = ioc->page_size - 1;
                return 0;
        }