Add callback nvme_mpath_chr_uring_cmd, which is equivalent to nvme_ns_head_chr_uring_cmd().
Also fill in chr_uring_cmd_iopoll with same function as currently used, chr_uring_cmd_iopoll(). Signed-off-by: John Garry <[email protected]> --- drivers/nvme/host/ioctl.c | 8 ++++++++ drivers/nvme/host/multipath.c | 2 ++ drivers/nvme/host/nvme.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index ee99b8dbcdfff..07509a03d2ef4 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -719,6 +719,14 @@ void nvme_mpath_ioctl_finish(void *opaque) nvme_put_ctrl(opaque); } +int nvme_mpath_chr_uring_cmd(struct mpath_device *mpath_device, + struct io_uring_cmd *ioucmd, + unsigned int issue_flags) +{ + return nvme_ns_uring_cmd(nvme_mpath_to_ns(mpath_device), ioucmd, + issue_flags); +} + static int nvme_ns_head_ctrl_ioctl(struct nvme_ns *ns, unsigned int cmd, void __user *argp, struct nvme_ns_head *head, int srcu_idx, bool open_for_write) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 5e49cd716f859..a51944ca56b1f 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -1448,4 +1448,6 @@ static const struct mpath_head_template mpdt = { .cdev_ioctl = nvme_mpath_cdev_ioctl, .ioctl_begin = nvme_mpath_ioctl_begin, .ioctl_finish = nvme_mpath_ioctl_finish, + .chr_uring_cmd = nvme_mpath_chr_uring_cmd, + .chr_uring_cmd_iopoll = nvme_ns_chr_uring_cmd_iopoll, }; diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 1ec45cce05c9c..efa868ba3fbf8 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -1052,6 +1052,8 @@ void nvme_mpath_clear_ctrl_paths(struct nvme_ctrl *ctrl); void nvme_mpath_remove_disk(struct nvme_ns_head *head); void nvme_mpath_start_request(struct request *rq); void nvme_mpath_end_request(struct request *rq); +int nvme_mpath_chr_uring_cmd(struct mpath_device *mpath_device, + struct io_uring_cmd *ioucmd, unsigned int issue_flags); long nvme_mpath_cdev_ioctl(struct mpath_device *mpath_device, unsigned int cmd, unsigned long arg, bool open_for_write); -- 2.43.5
