Re: [PATCH] nvme: host: core: fix precedence of ternary operator

[Keith Busch]

Thanks, applied.

Re: [PATCH] nvme: host: core: fix precedence of ternary operator

[Max Gurtovoy]

On 5/23/2018 5:56 PM, Ivan Bornyakov wrote:

Ternary operator have lower precedence then bitwise or, so 'cdw10' was
calculated wrong.

Signed-off-by: Ivan Bornyakov 
---
  drivers/nvme/host/core.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b070c659391f..1eba9b0cb9dc 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1577,7 +1577,7 @@ static int nvme_pr_reserve(struct block_device *bdev, u64 
key,
  static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new,
enum pr_type type, bool abort)
  {
-   u32 cdw10 = nvme_pr_type(type) << 8 | abort ? 2 : 1;
+   u32 cdw10 = nvme_pr_type(type) << 8 | (abort ? 2 : 1);
return nvme_pr_command(bdev, cdw10, old, new, nvme_cmd_resv_acquire);
  }
  
@@ -1589,7 +1589,7 @@ static int nvme_pr_clear(struct block_device *bdev, u64 key)
  
  static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type type)

  {
-   u32 cdw10 = nvme_pr_type(type) << 8 | key ? 1 << 3 : 0;
+   u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 1 << 3 : 0);
return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
  }
  



Looks good,

Reviewed-by: Max Gurtovoy 

[PATCH] nvme: host: core: fix precedence of ternary operator

[Ivan Bornyakov]

Ternary operator have lower precedence then bitwise or, so 'cdw10' was
calculated wrong.

Signed-off-by: Ivan Bornyakov 
---
 drivers/nvme/host/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b070c659391f..1eba9b0cb9dc 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1577,7 +1577,7 @@ static int nvme_pr_reserve(struct block_device *bdev, u64 
key,
 static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new,
enum pr_type type, bool abort)
 {
-   u32 cdw10 = nvme_pr_type(type) << 8 | abort ? 2 : 1;
+   u32 cdw10 = nvme_pr_type(type) << 8 | (abort ? 2 : 1);
return nvme_pr_command(bdev, cdw10, old, new, nvme_cmd_resv_acquire);
 }
 
@@ -1589,7 +1589,7 @@ static int nvme_pr_clear(struct block_device *bdev, u64 
key)
 
 static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type 
type)
 {
-   u32 cdw10 = nvme_pr_type(type) << 8 | key ? 1 << 3 : 0;
+   u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 1 << 3 : 0);
return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
 }
 
-- 
2.16.1