From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 9 Jan 2015 13:19:43 +0000 (-0500)
Subject: librbd: shadow variable in snap_unprotect and list_children
X-Git-Tag: v0.92~38^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9033bb121dddf2c61a58568946335947b3f2367;p=ceph.git

librbd: shadow variable in snap_unprotect and list_children

The shadow variable prevented snap_unprotect from returning the
correct error return code.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 0250e9cbbe76..4254470049f0 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -419,7 +419,7 @@ namespace librbd {
     for (std::list<std::pair<int64_t, string> >::const_iterator it =
          pools.begin(); it != pools.end(); ++it) {
       int64_t base_tier;
-      int r = rados.pool_get_base_tier(it->first, &base_tier);
+      r = rados.pool_get_base_tier(it->first, &base_tier);
       if (r == -ENOENT) {
         ldout(cct, 1) << "pool " << it->second << " no longer exists" << dendl;
         continue;
@@ -666,7 +666,7 @@ namespace librbd {
     for (std::list<std::pair<int64_t, std::string> >::const_iterator it =
          pools.begin(); it != pools.end(); ++it) {
       int64_t base_tier;
-      int r = rados.pool_get_base_tier(it->first, &base_tier);
+      r = rados.pool_get_base_tier(it->first, &base_tier);
       if (r == -ENOENT) {
         ldout(ictx->cct, 1) << "pool " << it->second << " no longer exists"
                             << dendl;