Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50af8bae authored by Keith Busch's avatar Keith Busch Committed by Matthew Wilcox
Browse files

NVMe: replace nvme_ns with nvme_dev for user admin 



The function nvme_user_admin_command does not require a namespace to
proceed.  Replace with the nvme_dev structure so that it can be called
from contexts that do not have a namespace.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
parent 5c42ea16

drivers/block/nvme.c

+2 −3
Original line number Diff line number Diff line
@@ -1151,10 +1151,9 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) 
	return status;

}



static int nvme_user_admin_cmd(struct nvme_ns *ns,

static int nvme_user_admin_cmd(struct nvme_dev *dev,

					struct nvme_admin_cmd __user *ucmd)

{

	struct nvme_dev *dev = ns->dev;

	struct nvme_admin_cmd cmd;

	struct nvme_command c;

	int status, length;
@@ -1209,7 +1208,7 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, 
	case NVME_IOCTL_ID:

		return ns->ns_id;

	case NVME_IOCTL_ADMIN_CMD:

		return nvme_user_admin_cmd(ns, (void __user *)arg);

		return nvme_user_admin_cmd(ns->dev, (void __user *)arg);

	case NVME_IOCTL_SUBMIT_IO:

		return nvme_submit_io(ns, (void __user *)arg);

	default: