Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
nvdimm
/
bus.c
diff --git
a/kernel/drivers/nvdimm/bus.c
b/kernel/drivers/nvdimm/bus.c
index
7e2c43f
..
5f47356
100644
(file)
--- a/
kernel/drivers/nvdimm/bus.c
+++ b/
kernel/drivers/nvdimm/bus.c
@@
-335,7
+335,7
@@
static const struct nd_cmd_desc __nd_cmd_dimm_descs[] = {
[ND_CMD_IMPLEMENTED] = { },
[ND_CMD_SMART] = {
.out_num = 2,
[ND_CMD_IMPLEMENTED] = { },
[ND_CMD_SMART] = {
.out_num = 2,
- .out_sizes = { 4, 8, },
+ .out_sizes = { 4,
12
8, },
},
[ND_CMD_SMART_THRESHOLD] = {
.out_num = 2,
},
[ND_CMD_SMART_THRESHOLD] = {
.out_num = 2,
@@
-513,10
+513,10
@@
static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm,
/* fail write commands (when read-only) */
if (read_only)
/* fail write commands (when read-only) */
if (read_only)
- switch (
ioctl_
cmd) {
- case ND_
IOCTL
_VENDOR:
- case ND_
IOCTL
_SET_CONFIG_DATA:
- case ND_
IOCTL
_ARS_START:
+ switch (cmd) {
+ case ND_
CMD
_VENDOR:
+ case ND_
CMD
_SET_CONFIG_DATA:
+ case ND_
CMD
_ARS_START:
dev_dbg(&nvdimm_bus->dev, "'%s' command while read-only.\n",
nvdimm ? nvdimm_cmd_name(cmd)
: nvdimm_bus_cmd_name(cmd));
dev_dbg(&nvdimm_bus->dev, "'%s' command while read-only.\n",
nvdimm ? nvdimm_cmd_name(cmd)
: nvdimm_bus_cmd_name(cmd));