Merge tag 'block-6.2-2022-12-29' of git://git.kernel.dk/linux

[linux-block.git] / drivers / nvme / host / core.c

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index d307ae4d8a57521bcc2c3d9c191a41682673421b..7be562a4e1aa72d6278f657a24730afabb47aee8 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2137,11 +2137,34 @@ static int nvme_send_ns_pr_command(struct nvme_ns *ns, struct nvme_command *c,
        return nvme_submit_sync_cmd(ns->queue, c, data, 16);
 }
 
+static int nvme_sc_to_pr_err(int nvme_sc)
+{
+       if (nvme_is_path_error(nvme_sc))
+               return PR_STS_PATH_FAILED;
+
+       switch (nvme_sc) {
+       case NVME_SC_SUCCESS:
+               return PR_STS_SUCCESS;
+       case NVME_SC_RESERVATION_CONFLICT:
+               return PR_STS_RESERVATION_CONFLICT;
+       case NVME_SC_ONCS_NOT_SUPPORTED:
+               return -EOPNOTSUPP;
+       case NVME_SC_BAD_ATTRIBUTES:
+       case NVME_SC_INVALID_OPCODE:
+       case NVME_SC_INVALID_FIELD:
+       case NVME_SC_INVALID_NS:
+               return -EINVAL;
+       default:
+               return PR_STS_IOERR;
+       }
+}
+
 static int nvme_pr_command(struct block_device *bdev, u32 cdw10,
                                u64 key, u64 sa_key, u8 op)
 {
        struct nvme_command c = { };
        u8 data[16] = { 0, };
+       int ret;
 
        put_unaligned_le64(key, &data[0]);
        put_unaligned_le64(sa_key, &data[8]);
@@ -2151,8 +2174,14 @@ static int nvme_pr_command(struct block_device *bdev, u32 cdw10,
 
        if (IS_ENABLED(CONFIG_NVME_MULTIPATH) &&
            bdev->bd_disk->fops == &nvme_ns_head_ops)
-               return nvme_send_ns_head_pr_command(bdev, &c, data);
-       return nvme_send_ns_pr_command(bdev->bd_disk->private_data, &c, data);
+               ret = nvme_send_ns_head_pr_command(bdev, &c, data);
+       else
+               ret = nvme_send_ns_pr_command(bdev->bd_disk->private_data, &c,
+                                             data);
+       if (ret < 0)
+               return ret;
+
+       return nvme_sc_to_pr_err(ret);
 }
 
 static int nvme_pr_register(struct block_device *bdev, u64 old,
@@ -4619,9 +4648,9 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl)
 }
 EXPORT_SYMBOL_GPL(nvme_remove_namespaces);
 
-static int nvme_class_uevent(struct device *dev, struct kobj_uevent_env *env)
+static int nvme_class_uevent(const struct device *dev, struct kobj_uevent_env *env)
 {
-       struct nvme_ctrl *ctrl =
+       const struct nvme_ctrl *ctrl =
                container_of(dev, struct nvme_ctrl, ctrl_device);
        struct nvmf_ctrl_options *opts = ctrl->opts;
        int ret;