From d857983301c428cf28995999f574aa4940d29b1e Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Thu, 14 Apr 2011 15:53:09 -0700 Subject: [PATCH] mds: Unify migration-handling code in _commit_slave_rename. We need to handle locks and pins on exported inodes but we were using a separate if block with its own (non-matching!) check for no good reason. Signed-off-by: Greg Farnum --- src/mds/Server.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 7f5d3708ed6ae..2315d9cb4b256 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -5669,14 +5669,12 @@ void Server::_commit_slave_rename(MDRequest *mdr, int r, // unfreeze assert(destdnl->get_inode()->is_frozen_inode() || - destdnl->get_inode()->is_freezing_inode()); + destdnl->get_inode()->is_freezing_inode()); destdnl->get_inode()->unfreeze_inode(finished); mds->queue_waiters(finished); - } - // drop our pins - if (srcdn->is_auth()) { + // drop our pins // we exported, clear out any xlocks that we moved to another MDS set::iterator i = mdr->xlocks.begin(); while(i != mdr->xlocks.end()) { -- 2.39.5