From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 5 Mar 2015 05:16:06 +0000 (+0100)
Subject: librbd/ObjectMap.cc: reduce scope of variable, prevent redef
X-Git-Tag: v9.0.0~186^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d78f4402fb711210867c33ef2fd6074d7fc84c2;p=ceph.git

librbd/ObjectMap.cc: reduce scope of variable, prevent redef

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

diff --git a/src/librbd/ObjectMap.cc b/src/librbd/ObjectMap.cc
index 4aa3c3b65921..7d758d9a965a 100644
--- a/src/librbd/ObjectMap.cc
+++ b/src/librbd/ObjectMap.cc
@@ -52,11 +52,11 @@ int ObjectMap::lock()
     }
   }
 
-  int r;
   bool broke_lock = false;
   CephContext *cct = m_image_ctx.cct;
   std::string oid(object_map_name(m_image_ctx.id, CEPH_NOSNAP));
   while (true) {
+    int r;
     ldout(cct, 10) << &m_image_ctx << " locking object map" << dendl;
     r = rados::cls::lock::lock(&m_image_ctx.md_ctx, oid,
 			       RBD_LOCK_NAME, LOCK_EXCLUSIVE, "", "", "",
@@ -73,9 +73,9 @@ int ObjectMap::lock()
     lockers_t lockers;
     ClsLockType lock_type;
     std::string lock_tag;
-    int r = rados::cls::lock::get_lock_info(&m_image_ctx.md_ctx, oid,
-                                            RBD_LOCK_NAME, &lockers,
-                                            &lock_type, &lock_tag);
+    r = rados::cls::lock::get_lock_info(&m_image_ctx.md_ctx, oid,
+                                        RBD_LOCK_NAME, &lockers,
+                                        &lock_type, &lock_tag);
     if (r == -ENOENT) {
       continue;
     } else if (r < 0) {