From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 19 Dec 2016 02:45:55 +0000 (-0800)
Subject: NVMe: Precedence error in nvme_pr_clear()
X-Git-Tag: v4.1.12-102.0.20170601_1400~193
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6d9f6f93699d2aeaa6a34f6423bb9b2be57de6e0;p=users%2Fjedix%2Flinux-maple.git

NVMe: Precedence error in nvme_pr_clear()

The original code is equivalent to:

        u32 cdw10 = (1 | key) ? 1 << 3 : 0;

But we want:

        u32 cdw10 = 1 | (key ? 1 << 3 : 0);

Fixes: 1d277a637a71: ('NVMe: Add persistent reservation ops')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit 73fcf4e20ebd19468b3ad033be93582258435462)

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/pci.c b/drivers/nvme/host/pci.c
index cc76dc091d0d3..1c4dbfa8f7fbd 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2136,7 +2136,7 @@ static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new,
 
 static int nvme_pr_clear(struct block_device *bdev, u64 key)
 {
-	u32 cdw10 = 1 | key ? 1 << 3 : 0;
+	u32 cdw10 = 1 | (key ? 1 << 3 : 0);
 	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_register);
 }