From 40a9c67f4e04f07f39e29a3c92d2882c9cbb0cd4 Mon Sep 17 00:00:00 2001 From: Kongming Date: Mon, 7 May 2001 07:50:45 +0800 Subject: [PATCH] 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 --- src/tools/rbd/action/MergeDiff.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/rbd/action/MergeDiff.cc b/src/tools/rbd/action/MergeDiff.cc index eb3f3a3741a5e..f56ec1f27d025 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; -- 2.39.5