lkml.org 
[lkml]   [2019]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.1 068/115] nvme: merge nvme_ns_ioctl into nvme_ioctl
    Date
    [ Upstream commit 90ec611adcf20b96d0c2b7166497d53e4301a57f ]

    Merge the two functions to make future changes a little easier.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Keith Busch <keith.busch@intel.com>
    Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/core.c | 47 ++++++++++++++++++++--------------------
    1 file changed, 24 insertions(+), 23 deletions(-)

    diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
    index decc0b3a3854..8b77e6a05f4b 100644
    --- a/drivers/nvme/host/core.c
    +++ b/drivers/nvme/host/core.c
    @@ -1383,32 +1383,11 @@ static void nvme_put_ns_from_disk(struct nvme_ns_head *head, int idx)
    srcu_read_unlock(&head->srcu, idx);
    }

    -static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned cmd, unsigned long arg)
    -{
    - switch (cmd) {
    - case NVME_IOCTL_ID:
    - force_successful_syscall_return();
    - return ns->head->ns_id;
    - case NVME_IOCTL_ADMIN_CMD:
    - return nvme_user_cmd(ns->ctrl, NULL, (void __user *)arg);
    - case NVME_IOCTL_IO_CMD:
    - return nvme_user_cmd(ns->ctrl, ns, (void __user *)arg);
    - case NVME_IOCTL_SUBMIT_IO:
    - return nvme_submit_io(ns, (void __user *)arg);
    - default:
    - if (ns->ndev)
    - return nvme_nvm_ioctl(ns, cmd, arg);
    - if (is_sed_ioctl(cmd))
    - return sed_ioctl(ns->ctrl->opal_dev, cmd,
    - (void __user *) arg);
    - return -ENOTTY;
    - }
    -}
    -
    static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
    unsigned int cmd, unsigned long arg)
    {
    struct nvme_ns_head *head = NULL;
    + void __user *argp = (void __user *)arg;
    struct nvme_ns *ns;
    int srcu_idx, ret;

    @@ -1416,7 +1395,29 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
    if (unlikely(!ns))
    return -EWOULDBLOCK;

    - ret = nvme_ns_ioctl(ns, cmd, arg);
    + switch (cmd) {
    + case NVME_IOCTL_ID:
    + force_successful_syscall_return();
    + ret = ns->head->ns_id;
    + break;
    + case NVME_IOCTL_ADMIN_CMD:
    + ret = nvme_user_cmd(ns->ctrl, NULL, argp);
    + break;
    + case NVME_IOCTL_IO_CMD:
    + ret = nvme_user_cmd(ns->ctrl, ns, argp);
    + break;
    + case NVME_IOCTL_SUBMIT_IO:
    + ret = nvme_submit_io(ns, argp);
    + break;
    + default:
    + if (ns->ndev)
    + ret = nvme_nvm_ioctl(ns, cmd, arg);
    + else if (is_sed_ioctl(cmd))
    + ret = sed_ioctl(ns->ctrl->opal_dev, cmd, argp);
    + else
    + ret = -ENOTTY;
    + }
    +
    nvme_put_ns_from_disk(head, srcu_idx);
    return ret;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-06-17 23:36    [W:2.293 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site