nvme: rename nvme_sc_to_pr_err to nvme_status_to_pr_err

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>

diff --git a/drivers/nvme/host/pr.c b/drivers/nvme/host/pr.c
index 8fa1ffcdaed48911970673d51924c7cba5f44557..a6db5edfab03a1a28f097138b61c5597c605fc73 100644 (file)
--- a/drivers/nvme/host/pr.c
+++ b/drivers/nvme/host/pr.c
@@ -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:
@@ -121,7 +121,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,
@@ -196,7 +196,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,