RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-14 07:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7046 from clever215/merge_diff_1224

Browse Source 
rbd: correct an output string for merge-diff

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-01-05 11:29:14 -05:00
commit eb5e852046
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/rbd/action/MergeDiff.cc
View File

@ -290,9 +290,9 @@ static int do_merge_diff(const char *first, const char *second,
uint64_t last_off = s_off;
r = parse_diff_body(sd, &s_tag, &s_off, &s_len);
dout(2) << "second diff data chunk: tag=" << f_tag << ", "
<< "off=" << f_off << ", "
<< "len=" << f_len << dendl;
dout(2) << "second diff data chunk: tag=" << s_tag << ", "
<< "off=" << s_off << ", "
<< "len=" << s_len << dendl;
if (r < 0) {
std::cerr << "rbd: failed to read second diff data chunk header"
<< std::endl;