diff options
| author | Christoph Hellwig <hch@lst.de> | 2024-06-27 14:49:13 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-06-28 10:37:34 -0600 |
| commit | 8b77f23fadcbb030a898f168bebe74f465e5d5a2 (patch) | |
| tree | 22ad813e3e620002ca55cd0f083fc2389a3f3cd6 | |
| parent | aa57abe6a7f91fafe53fb98d0f1e74db951bce24 (diff) | |
| download | lwn-8b77f23fadcbb030a898f168bebe74f465e5d5a2.tar.gz lwn-8b77f23fadcbb030a898f168bebe74f465e5d5a2.zip | |
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>
| -rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 12d08d8ba538..b050aedc9d43 100644 --- 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; } |