Commit 22f19a58 authored by Weiwen Hu's avatar Weiwen Hu Committed by Keith Busch
Browse files

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: default avatarWeiwen Hu <huweiwen@linux.alibaba.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 1a9e2181

drivers/nvme/host/pr.c

+5 −5
Original line number Diff line number Diff line
@@ -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 @@ static int nvme_pr_resv_report(struct block_device *bdev, void *data, 
	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,