[dm-devel] [PATCH v4 10/18] nvme: Add helper to send pr command

[Mike Christie]

Move the code that checks for multipath support and sends the pr command
to a new helper so it can be used by the reservation report support added
in the next patches.

Signed-off-by: Mike Christie <michael.chris...@oracle.com>
---
 drivers/nvme/host/pr.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/drivers/nvme/host/pr.c b/drivers/nvme/host/pr.c
index 26ad25f7280b..7a1d93da4970 100644
--- a/drivers/nvme/host/pr.c
+++ b/drivers/nvme/host/pr.c
@@ -27,7 +27,7 @@ static char nvme_pr_type(enum pr_type type)
 }
 
 static int nvme_send_ns_head_pr_command(struct block_device *bdev,
-               struct nvme_command *c, u8 *data, unsigned int data_len)
+               struct nvme_command *c, void *data, unsigned int data_len)
 {
        struct nvme_ns_head *head = bdev->bd_disk->private_data;
        int srcu_idx = srcu_read_lock(&head->srcu);
@@ -43,7 +43,7 @@ static int nvme_send_ns_head_pr_command(struct block_device 
*bdev,
 }
 
 static int nvme_send_ns_pr_command(struct nvme_ns *ns, struct nvme_command *c,
-               u8 *data, unsigned int data_len)
+               void *data, unsigned int data_len)
 {
        c->common.nsid = cpu_to_le32(ns->head->ns_id);
        return nvme_submit_sync_cmd(ns->queue, c, data, data_len);
@@ -71,6 +71,17 @@ static int nvme_sc_to_pr_err(int nvme_sc)
        }
 }
 
+static int nvme_send_pr_command(struct block_device *bdev,
+               struct nvme_command *c, void *data, unsigned int data_len)
+{
+       if (IS_ENABLED(CONFIG_NVME_MULTIPATH) &&
+           bdev->bd_disk->fops == &nvme_ns_head_ops)
+               return nvme_send_ns_head_pr_command(bdev, c, data, data_len);
+       else
+               return nvme_send_ns_pr_command(bdev->bd_disk->private_data, c,
+                                              data, data_len);
+}
+
 static int nvme_pr_command(struct block_device *bdev, u32 cdw10,
                                u64 key, u64 sa_key, u8 op)
 {
@@ -84,13 +95,7 @@ static int nvme_pr_command(struct block_device *bdev, u32 
cdw10,
        c.common.opcode = op;
        c.common.cdw10 = cpu_to_le32(cdw10);
 
-       if (IS_ENABLED(CONFIG_NVME_MULTIPATH) &&
-           bdev->bd_disk->fops == &nvme_ns_head_ops)
-               ret = nvme_send_ns_head_pr_command(bdev, &c, data,
-                                                  sizeof(data));
-       else
-               ret = nvme_send_ns_pr_command(bdev->bd_disk->private_data, &c,
-                                             data, sizeof(data));
+       ret = nvme_send_pr_command(bdev, &c, data, sizeof(data));
        if (ret < 0)
                return ret;
 
-- 
2.25.1

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel