From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Fri, 2 Jan 2015 17:36:54 +0000 (+0100)
Subject: ceph_objectstore_tool.cc: reduce scope of variable
X-Git-Tag: v0.80.10~69^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f82f824c7b1bb246bdb54b11a694133a49da70a;p=ceph.git

ceph_objectstore_tool.cc: reduce scope of variable

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 78542f9a901c05e627b53b5306ea604be3bc82e8)
---

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 23ed079da1c0..17cda43ede3f 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -354,11 +354,10 @@ struct action_on_object_t {
 int _action_on_all_objects_in_pg(ObjectStore *store, coll_t coll, action_on_object_t &action, bool debug)
 {
   unsigned LIST_AT_A_TIME = 100;
-  int r;
   ghobject_t next;
   while (!next.is_max()) {
     vector<ghobject_t> list;
-    r = store->collection_list_partial(
+    int r = store->collection_list_partial(
 				       coll,
 				       next,
 				       LIST_AT_A_TIME,