From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
Christoph Hellwig <hch@lst.de>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.19 22/25] nvme: add new line after variable declatation
Date: Mon, 3 Oct 2022 09:12:25 +0200 [thread overview]
Message-ID: <20221003070716.067118204@linuxfoundation.org> (raw)
In-Reply-To: <20221003070715.406550966@linuxfoundation.org>
From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
[ Upstream commit f1c772d581843e3a14bbd62ef7e40b56fc307f27 ]
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>
Stable-dep-of: c292a337d0e4 ("nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/nvme/host/core.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index a0a805a5ab6b..44ee6dc5e0ca 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1716,18 +1716,21 @@ 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);
+
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);
}
--
2.35.1
next prev parent reply other threads:[~2022-10-03 7:47 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-03 7:12 [PATCH 4.19 00/25] 4.19.261-rc1 review Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 01/25] uas: add no-uas quirk for Hiksemi usb_disk Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 02/25] usb-storage: Add Hiksemi USB3-FW to IGNORE_UAS Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 03/25] uas: ignore UAS for Thinkplus chips Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 04/25] net: usb: qmi_wwan: Add new usb-id for Dell branded EM7455 Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 05/25] ARM: dts: integrator: Tag PCI host with device_type Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 06/25] ntfs: fix BUG_ON in ntfs_lookup_inode_by_name() Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 07/25] libata: add ATA_HORKAGE_NOLPM for Pioneer BDR-207M and BDR-205 Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 08/25] mmc: moxart: fix 4-bit bus width and remove 8-bit bus width Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 09/25] mm/page_alloc: fix race condition between build_all_zonelists and page allocation Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 10/25] mm: prevent page_frag_alloc() from corrupting the memory Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 11/25] mm/migrate_device.c: flush TLB while holding PTL Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 12/25] ima: Have the LSM free its audit rule Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 13/25] ima: Free the entire rule when deleting a list of rules Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 14/25] ima: Free the entire rule if it fails to parse Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 15/25] soc: sunxi: sram: Actually claim SRAM regions Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 16/25] soc: sunxi: sram: Prevent the driver from being unbound Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 17/25] soc: sunxi: sram: Fix probe function ordering issues Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 18/25] soc: sunxi: sram: Fix debugfs info for A64 SRAM C Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 19/25] Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time" Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 20/25] Input: melfas_mip4 - fix return value check in mip4_probe() Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 21/25] usbnet: Fix memory leak in usbnet_disconnect() Greg Kroah-Hartman
2022-10-03 7:12 ` Greg Kroah-Hartman [this message]
2022-10-03 7:12 ` [PATCH 4.19 23/25] nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 24/25] selftests: Fix the if conditions of in test_extra_filter() Greg Kroah-Hartman
2022-10-03 7:12 ` [PATCH 4.19 25/25] clk: iproc: Do not rely on node name for correct PLL setup Greg Kroah-Hartman
2022-10-03 11:31 ` [PATCH 4.19 00/25] 4.19.261-rc1 review Jon Hunter
2022-10-03 12:51 ` Slade Watkins
2022-10-03 13:49 ` Pavel Machek
2022-10-03 14:00 ` Greg Kroah-Hartman
2022-10-03 14:21 ` Pavel Machek
2022-10-03 17:53 ` Guenter Roeck
2022-10-03 22:02 ` Shuah Khan
2022-10-04 8:58 ` Naresh Kamboju
2022-10-04 11:28 ` Sudip Mukherjee (Codethink)
2022-10-07 14:41 ` zhouzhixiu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221003070716.067118204@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=chaitanya.kulkarni@wdc.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.