NVMe: Add persistent reservation ops

NVMe: Add persistent reservation ops

[Keith Busch]

On Tue, Nov 03, 2015@03:58:15PM +0300, Dan Carpenter wrote:
> 
> 	drivers/nvme/host/pci.c:2143 nvme_pr_clear()
> 	warn: suspicious bitop condition
> 
> drivers/nvme/host/pci.c
>   2141  static int nvme_pr_clear(struct block_device *bdev, u64 key)
>   2142  {
>   2143          u32 cdw10 = 1 | key ? 1 << 3 : 0;
> 
> Is this supposed to be?
> 
> 		u32 cdw10 = 1 | (key ? 1 << 3 : 0);
> 
>   2144          return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_register);
>   2145  }

Thanks for the catch. Must have pulled the patch from the wrong machine
when I added it to the persistent reservation series. Do you want to
send the fixing patch?

[patch] NVMe: Precedence error in nvme_pr_clear()

[Dan Carpenter]

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 at oracle.com>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 34fae28..8bcb772 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2140,7 +2140,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);
 }
 

[patch] NVMe: Precedence error in nvme_pr_clear()

[Jens Axboe]

On 11/03/2015 12:50 PM, Dan Carpenter wrote:
> 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 at oracle.com>

Thanks Dan, applied.


-- 
Jens Axboe