summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-03-01 13:38:11 +0100
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-03-01 13:38:11 +0100
commiteedb463846f7f2384260304b84362cd3ac68bb87 (patch)
tree6ca96a2d70e4bb368a45708aea11208bd2e995ef
parent116d8d1fc0fa5c7fd6da58f48ef83a59d9dbaf21 (diff)
downloadceph-eedb463846f7f2384260304b84362cd3ac68bb87.tar.gz
mds/Server.cc: reduce scope of some variables
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
-rw-r--r--src/mds/Server.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 76fb57c06b5..de7ad5a43e3 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);