From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Fri, 1 Mar 2013 12:38:11 +0000 (+0100)
Subject: mds/Server.cc: reduce scope of some variables
X-Git-Tag: v0.59~54^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eedb463846f7f2384260304b84362cd3ac68bb87;p=ceph.git

mds/Server.cc: reduce scope of some variables

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

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 76fb57c06b51..de7ad5a43e3b 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -6632,12 +6632,12 @@ void Server::_commit_slave_rename(MDRequest *mdr, int r,
 
   CDentry::linkage_t *destdnl = destdn->get_linkage();
 
-  ESlaveUpdate *le;
   list<Context*> finished;
   if (r == 0) {
     // write a commit to the journal
-    le = new ESlaveUpdate(mdlog, "slave_rename_commit", mdr->reqid, mdr->slave_to_mds,
-			  ESlaveUpdate::OP_COMMIT, ESlaveUpdate::RENAME);
+    ESlaveUpdate *le = new ESlaveUpdate(mdlog, "slave_rename_commit", mdr->reqid, 
+					mdr->slave_to_mds, ESlaveUpdate::OP_COMMIT, 
+					ESlaveUpdate::RENAME);
     mdlog->start_entry(le);
 
     // unfreeze+singleauth inode
@@ -6887,8 +6887,8 @@ void Server::do_rename_rollback(bufferlist &rbl, int master, MDRequest *mdr)
   if (straydn)
     destdn->push_projected_linkage();
 
-  inode_t *ti = NULL;
   if (target) {
+    inode_t *ti = NULL;
     if (target->authority().first == whoami) {
       ti = target->project_inode();
       mut->add_projected_inode(target);