hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libnvdimm: remove else after return in nsio_rw_bytes() 

else after return is not needed.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
[djbw: removed some now unnecessary newlines]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Fabian Frederick 2016-12-04 10:45:13 -08:00 committed by Dan Williams
parent 238b323a68
commit d37806dc37
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/nvdimm/claim.c
View File

@ -242,28 +242,25 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns,
if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align)))
return -EIO;
return memcpy_from_pmem(buf, nsio->addr + offset, size);
} else {
}
if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) {
if (IS_ALIGNED(offset, 512) && IS_ALIGNED(size, 512)) {
long cleared;
cleared = nvdimm_clear_poison(&ndns->dev,
offset, size);
cleared = nvdimm_clear_poison(&ndns->dev, offset, size);
if (cleared != size) {
size = cleared;
rc = -EIO;
}
badblocks_clear(&nsio->bb, sector,
cleared >> 9);
badblocks_clear(&nsio->bb, sector, cleared >> 9);
} else
rc = -EIO;
}
memcpy_to_pmem(nsio->addr + offset, buf, size);
nvdimm_flush(to_nd_region(ndns->dev.parent));
}
return rc;
}