RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

os/bluestore: clean up csum read error checks

Browse Source 
Fix warning message and return error code.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-06-09 15:20:45 -04:00
parent 3ef840d88a
commit d445d5b8cc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/os/bluestore/BlueStore.cc
View File

@ -3338,7 +3338,10 @@ int BlueStore::_do_read(
assert(r == 0);
bl.claim_append(t);
});
_verify_csum(&bptr->blob, r_off, bl);
int r = _verify_csum(&bptr->blob, r_off, bl);
if (r < 0) {
return r;
}
// prune and keep result
ready_regions[reg.logical_offset].substr_of(bl, front, reg.length);
@ -3446,10 +3449,10 @@ int BlueStore::_verify_csum(const bluestore_blob_t* blob, uint64_t blob_xoffset,
int r = blob->verify_csum(blob_xoffset, bl, &bad);
if (r < 0) {
if (r == -1) {
dout(20) << __func__ << "bad checksum at blob offset 0x"
dout(20) << __func__ << " bad checksum at blob offset 0x"
<< std::hex << bad << std::dec << dendl;
} else {
derr << __func__ << "failed with exit code: " << cpp_strerror(r) << dendl;
derr << __func__ << " failed with exit code: " << cpp_strerror(r) << dendl;
}
return r;
} else {