From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 17 Feb 2016 15:01:20 +0000 (+0100)
Subject: librbd/DiffIterate.cc: reduce scope of variable
X-Git-Tag: v10.1.0~312^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c645bd9c09eea68e0443bc33db293c5d427b0574;p=ceph.git

librbd/DiffIterate.cc: reduce scope of variable

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/librbd/DiffIterate.cc b/src/librbd/DiffIterate.cc
index 4305f299b475..31657d726a40 100644
--- a/src/librbd/DiffIterate.cc
+++ b/src/librbd/DiffIterate.cc
@@ -349,7 +349,6 @@ int DiffIterate::diff_object_map(uint64_t from_snap_id, uint64_t to_snap_id,
   }
 
   object_diff_state->clear();
-  int r;
   uint64_t current_snap_id = from_snap_id;
   uint64_t next_snap_id = to_snap_id;
   BitVector<2> prev_object_map;
@@ -371,7 +370,7 @@ int DiffIterate::diff_object_map(uint64_t from_snap_id, uint64_t to_snap_id,
     }
 
     uint64_t flags;
-    r = m_image_ctx.get_flags(from_snap_id, &flags);
+    int r = m_image_ctx.get_flags(from_snap_id, &flags);
     if (r < 0) {
       lderr(cct) << "diff_object_map: failed to retrieve image flags" << dendl;
       return r;