From: Kongming <wu.kongming@h3c.com>
Date: Sun, 6 May 2001 23:50:45 +0000 (+0800)
Subject: rbd: correct an output string for merge-diff
X-Git-Tag: v10.0.3~136^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40a9c67f4e04f07f39e29a3c92d2882c9cbb0cd4;p=ceph.git

rbd: correct an output string for merge-diff

This modification correct an output string for rbd merge-diff, in which mistakenly output variables of first diff header rather than second diff header.

Signed-off-by: Kongming Wu <wu.kongming@h3c.com>
---

diff --git a/src/tools/rbd/action/MergeDiff.cc b/src/tools/rbd/action/MergeDiff.cc
index eb3f3a3741a5..f56ec1f27d02 100644
--- a/src/tools/rbd/action/MergeDiff.cc
+++ b/src/tools/rbd/action/MergeDiff.cc
@@ -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;