From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 15 May 2013 12:05:10 +0000 (+0200)
Subject: os/FileStore.cc: reduce scope of a local variable
X-Git-Tag: v0.64~119^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea7d8a4df89d70d4896ed180087cb1daf38d0ac1;p=ceph.git

os/FileStore.cc: reduce scope of a local variable

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

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 332019b68cce..57a84ab8dcbb 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -4451,13 +4451,12 @@ bool FileStore::collection_empty(coll_t c)
 int FileStore::collection_list_range(coll_t c, hobject_t start, hobject_t end,
                                      snapid_t seq, vector<hobject_t> *ls)
 {
-  int r = 0;
   bool done = false;
   hobject_t next = start;
 
   while (!done) {
     vector<hobject_t> next_objects;
-    r = collection_list_partial(c, next,
+    int r = collection_list_partial(c, next,
                                 get_ideal_list_min(), get_ideal_list_max(),
                                 seq, &next_objects, &next);
     if (r < 0)