]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds/Migrator: don't use c++11 kw 'final' as var name 5042/head
authorJohn Spray <john.spray@redhat.com>
Mon, 22 Jun 2015 11:19:46 +0000 (12:19 +0100)
committerJohn Spray <john.spray@redhat.com>
Mon, 22 Jun 2015 11:19:46 +0000 (12:19 +0100)
If for no other reason than that it looks weird
in an editor.

Signed-off-by: John Spray <john.spray@redhat.com>
src/mds/Migrator.cc

index 86e10feb3b1574636aa5d71ed9fbf9d6555af1c7..e7e0e0a39a72cb289f0a5bee08daf2bbfcc4ee95 100644 (file)
@@ -1042,12 +1042,12 @@ void Migrator::export_frozen(CDir *dir, uint64_t tid)
 
       start = 'f';  // start with dirfrag
     }
-    bufferlist final;
+    bufferlist final_bl;
     dirfrag_t df = cur->dirfrag();
-    ::encode(df, final);
-    ::encode(start, final);
-    final.claim_append(tracebl);
-    prep->add_trace(final);
+    ::encode(df, final_bl);
+    ::encode(start, final_bl);
+    final_bl.claim_append(tracebl);
+    prep->add_trace(final_bl);
   }
 
   // send.