From bc1e52ff5f2eb6cca1cc2b6f46e84a998d753863 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Tue, 2 Oct 2012 16:55:44 +0800 Subject: [PATCH] mds: Allow rename request for stray migration/reintegration Allow rename request to modify system directory if it is for stray migration/reintegration. Signed-off-by: Yan, Zheng --- src/mds/Server.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 4c52ca2f36d6c..8584e60fdd61c 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -1983,7 +1983,7 @@ CDentry* Server::rdlock_path_xlock_dentry(MDRequest *mdr, int n, } CInode *diri = dir->get_inode(); - if (diri->is_system() && !diri->is_root()) { + if (!mdr->reqid.name.is_mds() && diri->is_system() && !diri->is_root()) { reply_request(mdr, -EROFS); return 0; } @@ -5126,10 +5126,12 @@ void Server::handle_client_rename(MDRequest *mdr) pdn = pdn->get_dir()->inode->parent; } - // is this a stray reintegration or merge? (sanity checks!) + // is this a stray migration, reintegration or merge? (sanity checks!) if (mdr->reqid.name.is_mds() && - (!destdnl->is_remote() || - destdnl->get_remote_ino() != srci->ino())) { + !(MDS_INO_IS_STRAY(srcpath.get_ino()) && + MDS_INO_IS_STRAY(destpath.get_ino())) && + !(destdnl->is_remote() && + destdnl->get_remote_ino() == srci->ino())) { reply_request(mdr, -EINVAL); // actually, this won't reply, but whatev. return; } -- 2.39.5