diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-09 21:05:45 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-09 21:05:45 (GMT) |
| commit | 239467e852a4d2dcd255093bfafc92a9adbb76a2 (patch) | |
| tree | 0de49c2258d35c3e8432a772fe17baaf02ad7fca /drivers/nvdimm/bus.c | |
| parent | 289b7bfd483c8ca3dfde92d7e19a8b70e0b81248 (diff) | |
| parent | a390180291dd9a2392bbab4242cde712c326efc6 (diff) | |
| download | linux-239467e852a4d2dcd255093bfafc92a9adbb76a2.tar.xz | |
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fixes from Dan Williams:
"Three fixes, the first two are tagged for -stable:
- The ndctl utility/library gained expanded unit tests illuminating a
long standing bug in the libnvdimm SMART data retrieval
implementation.
It has been broken since its initial implementation, now fixed.
- Another one line fix for the detection of stale info blocks.
Without this change userspace can get into a situation where it is
unable to reconfigure a namespace.
- Fix the badblock initialization path in the presence of the new (in
v4.6-rc1) section alignment workarounds.
Without this change badblocks will be reported at the wrong offset.
These have received a build success report from the kbuild robot and
have appeared in -next with no reported issues"
* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment
libnvdimm, pfn: fix uuid validation
libnvdimm: fix smart data retrieval
Diffstat (limited to 'drivers/nvdimm/bus.c')
| -rw-r--r-- | drivers/nvdimm/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index fc82743..19f822d 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -407,7 +407,7 @@ static const struct nd_cmd_desc __nd_cmd_dimm_descs[] = { [ND_CMD_IMPLEMENTED] = { }, [ND_CMD_SMART] = { .out_num = 2, - .out_sizes = { 4, 8, }, + .out_sizes = { 4, 128, }, }, [ND_CMD_SMART_THRESHOLD] = { .out_num = 2, |