From: John Spray <john.spray@redhat.com>
Date: Mon, 22 Jun 2015 11:19:46 +0000 (+0100)
Subject: mds/Migrator: don't use c++11 kw 'final' as var name
X-Git-Tag: v9.0.3~125^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5042%2Fhead;p=ceph.git

mds/Migrator: don't use c++11 kw 'final' as var name

If for no other reason than that it looks weird
in an editor.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 86e10feb3b15..e7e0e0a39a72 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -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.