From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 5 Mar 2015 05:18:04 +0000 (+0100)
Subject: librbd/internal.cc: reduce scope of some variables
X-Git-Tag: v9.0.0~186^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e11f9d2c71a63d50f45f59352da167f9830cc151;p=ceph.git

librbd/internal.cc: reduce scope of some variables

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

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 9551332f8922..40b6be03198d 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1886,9 +1886,9 @@ reprotect_and_return_err:
     vector<uint8_t> snap_protection;
     vector<uint64_t> snap_flags;
     {
-      int r;
       RWLock::WLocker l(ictx->snap_lock);
       {
+	int r;
 	RWLock::WLocker l2(ictx->parent_lock);
 	ictx->lockers.clear();
 	if (ictx->old_format) {
@@ -2512,11 +2512,11 @@ reprotect_and_return_err:
     }
 
     uint64_t object_size;
-    uint64_t overlap;
     uint64_t overlap_objects;
     ::SnapContext snapc;
 
     {
+      uint64_t overlap;
       RWLock::RLocker l(ictx->snap_lock);
       RWLock::RLocker l2(ictx->parent_lock);