From: Jason Luo <zhangqing.luo@oracle.com>
Date: Wed, 3 Feb 2016 03:15:05 +0000 (+0800)
Subject: Nvme: fix several build errors
X-Git-Tag: v4.1.12-92~126^2~230
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=16a590cf627cbca98e4fa12536cc4311587789c9;p=users%2Fjedix%2Flinux-maple.git

Nvme: fix several build errors

struct nvme_queue' has no member named 'hctx which introduced
by a55c4be4f9afc516368d3a45360f735887cf72fe.

'REQ_TYPE_DRV_PRIV' undeclared (first use in this function)
while it's redefined as REQ_TYPE_SPECIAL in uek4.

Orabug: 22620486

Signed-off-by: Jason Luo <zhangqing.luo@oracle.com>
---

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index e728c57de2d16..5a3bf9bb38444 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -928,7 +928,7 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
 
 	nvme_set_info(cmd, iod, req_completion);
 	spin_lock_irq(&nvmeq->q_lock);
-	if (req->cmd_type == REQ_TYPE_DRV_PRIV)
+	if (req->cmd_type == REQ_TYPE_SPECIAL)
 		nvme_submit_priv(nvmeq, req, iod);
 	else if (req->cmd_flags & REQ_DISCARD)
 		nvme_submit_discard(nvmeq, ns, req, iod);
@@ -1026,7 +1026,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
 	if (IS_ERR(req))
 		return PTR_ERR(req);
 
-	req->cmd_type = REQ_TYPE_DRV_PRIV;
+	req->cmd_type = REQ_TYPE_SPECIAL; 
 	req->__data_len = 0;
 	req->__sector = (sector_t) -1;
 	req->bio = req->biotail = NULL;