]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
JournalScanner.cc: reduce scope of local variable
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 22 Oct 2014 08:58:45 +0000 (10:58 +0200)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Sun, 26 Oct 2014 17:10:14 +0000 (18:10 +0100)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/tools/cephfs/JournalScanner.cc

index e38f6694d81c6ea0ed9424917cfd723c48da24ff..3b79a773f10ee3a711404b7d9f7f557d952832ca 100644 (file)
@@ -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) {