mirror of
https://github.com/ceph/ceph
synced 2024-12-22 03:22:00 +00:00
Merge pull request #2894 from ceph/wip-scrub-coverity
Wip scrub coverity
This commit is contained in:
commit
f4347bc091
src/mds
@ -3541,7 +3541,7 @@ void CInode::validate_disk_state(CInode::validated_data *results,
|
||||
try {
|
||||
bufferlist::iterator p = bl.begin();
|
||||
::decode(results->backtrace.ondisk_value, p);
|
||||
} catch (buffer::malformed_input) {
|
||||
} catch (buffer::malformed_input&) {
|
||||
results->backtrace.passed = false;
|
||||
results->backtrace.error_str << "failed to decode on-disk backtrace!";
|
||||
return true;
|
||||
|
@ -436,9 +436,6 @@ int inode_t::compare(const inode_t &other, bool *divergent) const
|
||||
*divergent = !other.older_is_consistent(*this);
|
||||
return -1;
|
||||
}
|
||||
assert(0 == "can't have reached this point");
|
||||
*divergent = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool inode_t::older_is_consistent(const inode_t &other) const
|
||||
|
Loading…
Reference in New Issue
Block a user