diff options
| author | Jerry Hoemann <jerry.hoemann@hpe.com> | 2017-06-30 20:41:22 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-07-01 08:49:59 -0700 |
| commit | 53b85a449b15e0e2e6727d8855e4c8b7627577e1 (patch) | |
| tree | ddd6cbc0e0a9047d7404b96e76b53893660f2b0b /drivers/nvdimm/bus.c | |
| parent | e6be2dcbefdb7c3817889363cee3e933695cba21 (diff) | |
| download | op-kernel-dev-53b85a449b15e0e2e6727d8855e4c8b7627577e1.zip op-kernel-dev-53b85a449b15e0e2e6727d8855e4c8b7627577e1.tar.gz | |
libnvdimm: passthru functions clear to send
Have dsm functions called via the pass thru mechanism also
be checked against clear to send.
Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm/bus.c')
| -rw-r--r-- | drivers/nvdimm/bus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index 63ce50d..9730db4 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -910,6 +910,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, static char in_env[ND_CMD_MAX_ENVELOPE]; const struct nd_cmd_desc *desc = NULL; unsigned int cmd = _IOC_NR(ioctl_cmd); + unsigned int func = cmd; void __user *p = (void __user *) arg; struct device *dev = &nvdimm_bus->dev; struct nd_cmd_pkg pkg; @@ -975,6 +976,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, } if (cmd == ND_CMD_CALL) { + func = pkg.nd_command; dev_dbg(dev, "%s:%s, idx: %llu, in: %zu, out: %zu, len %zu\n", __func__, dimm_name, pkg.nd_command, in_len, out_len, buf_len); @@ -1023,7 +1025,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, } nvdimm_bus_lock(&nvdimm_bus->dev); - rc = nd_cmd_clear_to_send(nvdimm_bus, nvdimm, cmd, buf); + rc = nd_cmd_clear_to_send(nvdimm_bus, nvdimm, func, buf); if (rc) goto out_unlock; |
