diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-13 10:54:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-13 10:54:01 -0700 |
| commit | 4596f55476b5b861ca37e525460d2e43e90f1f2e (patch) | |
| tree | 1fda96d8c50b7b4a103296866c1d5db281fc80c1 /drivers/nvdimm | |
| parent | 63f04777162181798399a2c4e5436d0d0c16291b (diff) | |
| parent | ee6581ceba7f8314b81b2f2a81f1cf3f67c679e2 (diff) | |
| download | linux-4596f55476b5b861ca37e525460d2e43e90f1f2e.tar.gz linux-4596f55476b5b861ca37e525460d2e43e90f1f2e.tar.bz2 linux-4596f55476b5b861ca37e525460d2e43e90f1f2e.zip | |
Merge tag 'libnvdimm-fixes-4.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fixes from Dave Jiang:
- ensure that a variable passed in by reference to acpi_nfit_ctl is
always set to a value. An incremental patch is provided due to notice
from testing in -next. The rest of the commits did not exhibit
issues.
- fix a return path in nsio_rw_bytes() that was not returning "bytes
remain" as expected for the function.
- address an issue where applications polling on scrub-completion for
the NVDIMM may falsely wakeup and read the wrong state value and
cause hang.
- change the test unit persistent capability attribute to fix up a
broken assumption in the unit test infrastructure wrt the
'write_cache' attribute
- ratelimit dev_info() in the dax device check_vma() function since
this is easily triggered from userspace
* tag 'libnvdimm-fixes-4.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
nfit: fix unchecked dereference in acpi_nfit_ctl
acpi, nfit: Fix scrub idle detection
tools/testing/nvdimm: advertise a write cache for nfit_test
acpi/nfit: fix cmd_rc for acpi_nfit_ctl to always return a value
dev-dax: check_vma: ratelimit dev_info-s
libnvdimm, pmem: Fix memcpy_mcsafe() return code handling in nsio_rw_bytes()
Diffstat (limited to 'drivers/nvdimm')
| -rw-r--r-- | drivers/nvdimm/claim.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c index 2e96b34bc936..fb667bf469c7 100644 --- a/drivers/nvdimm/claim.c +++ b/drivers/nvdimm/claim.c @@ -278,6 +278,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns, return -EIO; if (memcpy_mcsafe(buf, nsio->addr + offset, size) != 0) return -EIO; + return 0; } if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) { |