Commit e9a9853c authored by Ivan Bornyakov's avatar Ivan Bornyakov Committed by Keith Busch

nvme: host: core: fix precedence of ternary operator

Ternary operator have lower precedence then bitwise or, so 'cdw10' was
calculated wrong.
Signed-off-by: default avatarIvan Bornyakov <brnkv.i1@gmail.com>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
parent 978628ec
...@@ -1578,7 +1578,7 @@ static int nvme_pr_reserve(struct block_device *bdev, u64 key, ...@@ -1578,7 +1578,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, static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new,
enum pr_type type, bool abort) 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); return nvme_pr_command(bdev, cdw10, old, new, nvme_cmd_resv_acquire);
} }
...@@ -1590,7 +1590,7 @@ static int nvme_pr_clear(struct block_device *bdev, u64 key) ...@@ -1590,7 +1590,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) 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); return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment