Skip to content

Commit aa57abe

Browse files
Christoph Hellwigaxboe
authored andcommitted
megaraid_sas: don't set QUEUE_FLAG_NOMERGES
Setting QUEUE_FLAG_NOMERGES was added in commit 15dd038 ("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: Christoph Hellwig <[email protected]> Reviewed-by: Bart Van Assche <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 667ea36 commit aa57abe

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/scsi/megaraid/megaraid_sas_base.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,8 +1981,6 @@ megasas_set_nvme_device_properties(struct scsi_device *sdev,
19811981

19821982
lim->max_hw_sectors = max_io_size / 512;
19831983
lim->virt_boundary_mask = mr_nvme_pg_size - 1;
1984-
1985-
blk_queue_flag_set(QUEUE_FLAG_NOMERGES, sdev->request_queue);
19861984
}
19871985

19881986
/*

0 commit comments

Comments
 (0)