From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 22 Oct 2014 08:58:45 +0000 (+0200)
Subject: JournalScanner.cc: reduce scope of local variable
X-Git-Tag: v0.88~22^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=61872e43cf39b28073a30cc4a8850b8397cee5f8;p=ceph.git

JournalScanner.cc: reduce scope of local variable

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

diff --git a/src/tools/cephfs/JournalScanner.cc b/src/tools/cephfs/JournalScanner.cc
index e38f6694d81c..3b79a773f10e 100644
--- a/src/tools/cephfs/JournalScanner.cc
+++ b/src/tools/cephfs/JournalScanner.cc
@@ -132,8 +132,6 @@ int JournalScanner::scan_header()
 
 int JournalScanner::scan_events()
 {
-  int r;
-
   uint64_t object_size = g_conf->mds_log_segment_size;
   if (object_size == 0) {
     // Default layout object size
@@ -157,7 +155,7 @@ int JournalScanner::scan_events()
     // Read this journal segment
     bufferlist this_object;
     std::string const oid = obj_name(obj_offset);
-    r = io.read(oid, this_object, INT_MAX, 0);
+    int r = io.read(oid, this_object, INT_MAX, 0);
 
     // Handle absent journal segments
     if (r < 0) {