a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NVMe: Precedence error in nvme_pr_clear()

Browse Source 
The original code is equivalent to:

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

But we want:

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

Fixes: 1d277a637a: ('NVMe: Add persistent reservation ops')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Dan Carpenter 2015-11-03 22:50:49 +03:00 committed by Jens Axboe
parent a6dd1020d8
commit 73fcf4e20e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/nvme/host/pci.c
View File

@ -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) 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); return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_register);
} }