From d2ac024a09867bbd5eb263d553f10dc9f971c60b Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Thu, 25 Oct 2012 20:26:49 +0800 Subject: [PATCH] mds: fix stray migration/reintegration check in handle_client_rename The stray migration/reintegration generates a source path that will be rooted in a (possibly remote) MDS's MDSDIR; adjust the check in handle_client_rename() Signed-off-by: Yan, Zheng --- src/mds/Server.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 9c9ad3179cf50..4642a1346ff39 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -5138,7 +5138,7 @@ void Server::handle_client_rename(MDRequest *mdr) // is this a stray migration, reintegration or merge? (sanity checks!) if (mdr->reqid.name.is_mds() && - !(MDS_INO_IS_STRAY(srcpath.get_ino()) && + !(MDS_INO_IS_MDSDIR(srcpath.get_ino()) && MDS_INO_IS_STRAY(destpath.get_ino())) && !(destdnl->is_remote() && destdnl->get_remote_ino() == srci->ino())) { -- 2.39.5