diff options
Diffstat (limited to 'drivers/block/nvme.c')
-rw-r--r-- | drivers/block/nvme.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c index 46e33eec6298..89935853cb85 100644 --- a/drivers/block/nvme.c +++ b/drivers/block/nvme.c | |||
@@ -1151,10 +1151,9 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) | |||
1151 | return status; | 1151 | return status; |
1152 | } | 1152 | } |
1153 | 1153 | ||
1154 | static int nvme_user_admin_cmd(struct nvme_ns *ns, | 1154 | static int nvme_user_admin_cmd(struct nvme_dev *dev, |
1155 | struct nvme_admin_cmd __user *ucmd) | 1155 | struct nvme_admin_cmd __user *ucmd) |
1156 | { | 1156 | { |
1157 | struct nvme_dev *dev = ns->dev; | ||
1158 | struct nvme_admin_cmd cmd; | 1157 | struct nvme_admin_cmd cmd; |
1159 | struct nvme_command c; | 1158 | struct nvme_command c; |
1160 | int status, length; | 1159 | int status, length; |
@@ -1209,7 +1208,7 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, | |||
1209 | case NVME_IOCTL_ID: | 1208 | case NVME_IOCTL_ID: |
1210 | return ns->ns_id; | 1209 | return ns->ns_id; |
1211 | case NVME_IOCTL_ADMIN_CMD: | 1210 | case NVME_IOCTL_ADMIN_CMD: |
1212 | return nvme_user_admin_cmd(ns, (void __user *)arg); | 1211 | return nvme_user_admin_cmd(ns->dev, (void __user *)arg); |
1213 | case NVME_IOCTL_SUBMIT_IO: | 1212 | case NVME_IOCTL_SUBMIT_IO: |
1214 | return nvme_submit_io(ns, (void __user *)arg); | 1213 | return nvme_submit_io(ns, (void __user *)arg); |
1215 | default: | 1214 | default: |