From bb55f2e9d521214d8b48dc8d7f61e11beac801f4 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Jun 21 2021 16:00:57 +0000
Subject: nvme: add new line after variable declatation (bsc#1184259,

bsc#1178612, bsc#1186155).

---

diff --git a/patches.suse/nvme-add-new-line-after-variable-declatation.patch b/patches.suse/nvme-add-new-line-after-variable-declatation.patch
new file mode 100644
index 0000000..07dfde5
--- /dev/null
+++ b/patches.suse/nvme-add-new-line-after-variable-declatation.patch
@@ -0,0 +1,44 @@
+From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
+Date: Sun, 28 Feb 2021 18:06:11 -0800
+Subject: nvme: add new line after variable declatation
+Patch-mainline: v5.13-rc1
+Git-commit: f1c772d581843e3a14bbd62ef7e40b56fc307f27
+References: bsc#1184259, bsc#1178612, bsc#1186155
+
+Add a new line in functions nvme_pr_preempt(), nvme_pr_clear(), and
+nvme_pr_release() after variable declaration which follows the rest of
+the code in the nvme/host/core.c.
+
+No functional change(s) in this patch.
+
+Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Acked-by: Martin Wilck <mwilck@suse.com>
+---
+ drivers/nvme/host/core.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/nvme/host/core.c
++++ b/drivers/nvme/host/core.c
+@@ -2212,18 +2212,21 @@ static int nvme_pr_preempt(struct block_
+ 		enum pr_type type, bool abort)
+ {
+ 	u32 cdw10 = nvme_pr_type(type) << 8 | (abort ? 2 : 1);
++
+ 	return nvme_pr_command(bdev, cdw10, old, new, nvme_cmd_resv_acquire);
+ }
+ 
+ static int nvme_pr_clear(struct block_device *bdev, u64 key)
+ {
+ 	u32 cdw10 = 1 | (key ? 1 << 3 : 0);
++
+ 	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_register);
+ }
+ 
+ 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);
++
+ 	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
+ }
+ 
diff --git a/series.conf b/series.conf
index a77893c..e65ddf0 100644
--- a/series.conf
+++ b/series.conf
@@ -48728,6 +48728,7 @@
 	patches.suse/nvme-split-init-identify-into-helper.patch
 	patches.suse/nvme-mark-nvme_setup_passsthru-inline.patch
 	patches.suse/nvme-don-t-check-nvme_req-flags-for-new-req.patch
+	patches.suse/nvme-add-new-line-after-variable-declatation.patch
 	patches.suse/nvme-fc-check-sgl-supported-by-target.patch
 	patches.suse/nvme-remove-superfluous-else-in-nvme_ctrl_loss_tmo_s.patch
 	patches.suse/nvme-retrigger-ANA-log-update-if-group-descriptor-is.patch