diff options
| author | Christoph Hellwig <hch@lst.de> | 2024-06-27 14:49:12 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-06-28 10:37:34 -0600 |
| commit | aa57abe6a7f91fafe53fb98d0f1e74db951bce24 (patch) | |
| tree | 2f7c8f7b229dd2fe8f310d413ac0ee457b4735a5 | |
| parent | 667ea36378cf7f669044b27871c496e1559c872a (diff) | |
| download | linux-stable-aa57abe6a7f91fafe53fb98d0f1e74db951bce24.tar.gz linux-stable-aa57abe6a7f91fafe53fb98d0f1e74db951bce24.tar.bz2 linux-stable-aa57abe6a7f91fafe53fb98d0f1e74db951bce24.zip | |
megaraid_sas: don't set QUEUE_FLAG_NOMERGES
Setting QUEUE_FLAG_NOMERGES was added in commit 15dd03811d99dcf
("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 <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240627124926.512662-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 88acefbf9aea..6c79c350a4d5 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -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); } /* |