From: Christoph Hellwig <hch@lst.de>
Date: Sat, 16 Apr 2016 18:57:58 +0000 (-0400)
Subject: nvme: fix cntlid type
X-Git-Tag: v4.1.12-102.0.20170601_1400~92
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d27086b0320e8a40ec7da87fcbc4b2b54ff7b704;p=users%2Fjedix%2Flinux-maple.git

nvme: fix cntlid type

Controller IDs in NVMe are unsigned 16-bit types.  In the Fabrics driver we
actually pass ctrl->id by reference, so we need it to have the correct type.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit 76e3914ae51714b0535c38d9472d89124e0b6b96)

Orabug: 25130845

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 56451ebbedc89..0f0868ac8cb2b 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -72,7 +72,7 @@ struct nvme_ctrl {
 	char serial[20];
 	char model[40];
 	char firmware_rev[8];
-	int cntlid;
+	u16 cntlid;
 
 	u32 ctrl_config;