tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: rename nvme_sc_to_pr_err to nvme_status_to_pr_err

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2085849

[ Upstream commit 22f19a584d7045e0509f103dbc5c0acfd6415163 ]

This should better match its semantic.  "sc" is used in the NVMe spec to
specifically refer to the last 8 bits in the status field. We should not
reuse "sc" here.

Signed-off-by: Weiwen Hu <huweiwen@linux.alibaba.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Stable-dep-of: 899d2e5a4e3d ("nvmet: Identify-Active Namespace ID List command should reject invalid nsid")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com>
Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
This commit is contained in:
Weiwen Hu
2024-06-03 20:56:59 +08:00
committed by Mehmet Basaran
parent 52e3450f57
commit 6ce61d0dfd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/nvme/host/pr.c
+5 -5
View File
@@ -72,12 +72,12 @@ static int nvme_send_ns_pr_command(struct nvme_ns *ns, struct nvme_command *c,
return nvme_submit_sync_cmd(ns->queue, c, data, data_len);
}
static int nvme_sc_to_pr_err(int nvme_sc)
static int nvme_status_to_pr_err(int status)
{
if (nvme_is_path_error(nvme_sc))
if (nvme_is_path_error(status))
return PR_STS_PATH_FAILED;
switch (nvme_sc & 0x7ff) {
switch (status & 0x7ff) {
case NVME_SC_SUCCESS:
return PR_STS_SUCCESS;
case NVME_SC_RESERVATION_CONFLICT:
@@ -122,7 +122,7 @@ static int nvme_pr_command(struct block_device *bdev, u32 cdw10,
if (ret < 0)
return ret;
return nvme_sc_to_pr_err(ret);
return nvme_status_to_pr_err(ret);
}
static int nvme_pr_register(struct block_device *bdev, u64 old,
@@ -197,7 +197,7 @@ retry:
if (ret < 0)
return ret;
return nvme_sc_to_pr_err(ret);
return nvme_status_to_pr_err(ret);
}
static int nvme_pr_read_keys(struct block_device *bdev,