4.9-stable patches

added patches:
	nvme-host-core-fix-precedence-of-ternary-operator.patch

diff --git a/queue-4.9/nvme-host-core-fix-precedence-of-ternary-operator.patch b/queue-4.9/nvme-host-core-fix-precedence-of-ternary-operator.patch
new file mode 100644 (file)
index 0000000..9064ecd
--- /dev/null
+++ b/queue-4.9/nvme-host-core-fix-precedence-of-ternary-operator.patch
@@ -0,0 +1,42 @@
+From e9a9853c23c13a37546397b61b270999fd0fb759 Mon Sep 17 00:00:00 2001
+From: Ivan Bornyakov <brnkv.i1@gmail.com>
+Date: Wed, 23 May 2018 17:56:11 +0300
+Subject: nvme: host: core: fix precedence of ternary operator
+
+From: Ivan Bornyakov <brnkv.i1@gmail.com>
+
+commit e9a9853c23c13a37546397b61b270999fd0fb759 upstream.
+
+Ternary operator have lower precedence then bitwise or, so 'cdw10' was
+calculated wrong.
+
+Signed-off-by: Ivan Bornyakov <brnkv.i1@gmail.com>
+Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
+Signed-off-by: Keith Busch <keith.busch@intel.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/nvme/host/core.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/nvme/host/core.c
++++ b/drivers/nvme/host/core.c
+@@ -1043,7 +1043,7 @@ static int nvme_pr_reserve(struct block_
+ 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);
+ }
+ 
+@@ -1055,7 +1055,7 @@ static int nvme_pr_clear(struct block_de
+ 
+ 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);
+ }
+ 

diff --git a/queue-4.9/series b/queue-4.9/series
index a7ea8d3d10108a541744f88d718406d4990723f9..1c24d881b33ace06731e2b410365ae486742676c 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -172,3 +172,4 @@ workqueue-fix-missing-kfree-rescuer-in-destroy_workqueue.patch
 sunrpc-fix-crash-when-cache_head-become-valid-before.patch
 net-mlx5e-fix-sff-8472-eeprom-length.patch
 kernel-module.c-wakeup-processes-in-module_wq-on-mod.patch
+nvme-host-core-fix-precedence-of-ternary-operator.patch