Unverified Commit d068277c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13148 [OLK-6.6] [Backport] mpt3sas_scsih: don't set QUEUE_FLAG_NOMERGES 

Merge Pull Request from: @jingtongmeng 
 
 
 
Link:https://gitee.com/openeuler/kernel/pulls/13148

 

Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 771dc636 acee8a12

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+0 −6
Original line number Diff line number Diff line
@@ -2682,12 +2682,6 @@ scsih_slave_configure(struct scsi_device *sdev) 
		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);

		blk_queue_virt_boundary(sdev->request_queue,

				ioc->page_size - 1);

		return 0;