Commit 8b77f23f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

mpt3sas_scsih: don't set QUEUE_FLAG_NOMERGES 



Setting QUEUE_FLAG_NOMERGES was added in commit d1b01d14 ("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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240627124926.512662-4-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent aa57abe6

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

	}