From: Ashok Vairavan Date: Fri, 14 Jul 2017 18:44:54 +0000 (-0700) Subject: NVMe: Retain QUEUE_FLAG_SG_GAPS flag for bio vector alignment. X-Git-Tag: v4.1.12-106.0.20170720_1900~30 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=47a7218e1571cc0cc8bd5ebef5ac92a16334a26f;p=users%2Fjedix%2Flinux-maple.git NVMe: Retain QUEUE_FLAG_SG_GAPS flag for bio vector alignment. The nvme queue flag QUEUE_FLAG_SG_GAPS checks for the bio vector alignment against the page size. In upstream, the QUEUE_FLAG_SG_GAPS flag is replaced by blk_queue_virt_boundary() and pulling in the respective patches caused instability in the driver and hence QUEUE_FLAG_SG_GAPS flag is retained for vector alignment. Orabug: 26402433 Signed-off-by: Ashok Vairavan Reviewed-by: Martin K. Petersen Reviewed-by: Jack Vogel --- diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index ec77ee1feabd..9a44d49121e0 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1416,6 +1416,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) if (IS_ERR(ns->queue)) goto out_release_instance; queue_flag_set_unlocked(QUEUE_FLAG_NONROT, ns->queue); + queue_flag_set_unlocked(QUEUE_FLAG_SG_GAPS, ns->queue); ns->queue->queuedata = ns; ns->ctrl = ctrl;