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

megaraid_sas: don't set QUEUE_FLAG_NOMERGES 



Setting QUEUE_FLAG_NOMERGES was added in commit 15dd0381
("scsi: megaraid_sas: NVME Interface detection and prop settings")
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-3-hch@lst.de


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

drivers/scsi/megaraid/megaraid_sas_base.c

+0 −2
Original line number Diff line number Diff line
@@ -1981,8 +1981,6 @@ megasas_set_nvme_device_properties(struct scsi_device *sdev, 


	lim->max_hw_sectors = max_io_size / 512;

	lim->virt_boundary_mask = mr_nvme_pg_size - 1;



	blk_queue_flag_set(QUEUE_FLAG_NOMERGES, sdev->request_queue);

}



/*