]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_objectstore_tool.cc: reduce scope of variable
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Fri, 2 Jan 2015 17:36:54 +0000 (18:36 +0100)
committerDavid Zafman <dzafman@redhat.com>
Tue, 3 Mar 2015 19:20:59 +0000 (11:20 -0800)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 78542f9a901c05e627b53b5306ea604be3bc82e8)

src/tools/ceph_objectstore_tool.cc

index 23ed079da1c0ad60037cff1f2e1cbd9a57ebf18c..17cda43ede3fbf8275c4439dc3c74406a304cb78 100644 (file)
@@ -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,