From: "Yan, Zheng" <zheng.z.yan@intel.com>
To: sage@inktank.com, ceph-devel@vger.kernel.org
Cc: "Yan, Zheng" <zheng.z.yan@intel.com>
Subject: [PATCH 04/12] mds: Allow rename request for stray migration/reintegration
Date: Tue, 2 Oct 2012 16:55:44 +0800 [thread overview]
Message-ID: <1349168152-13281-4-git-send-email-zheng.z.yan@intel.com> (raw)
In-Reply-To: <1349168152-13281-1-git-send-email-zheng.z.yan@intel.com>
From: "Yan, Zheng" <zheng.z.yan@intel.com>
Allow rename request to modify system directory if it is for stray
migration/reintegration.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---
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 4c52ca2..8584e60 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;
}
--
1.7.11.4
next prev parent reply other threads:[~2012-10-02 8:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 8:55 [PATCH 01/12] mds: Don't drop client request from MDS Yan, Zheng
2012-10-02 8:55 ` [PATCH 02/12] mds: Consider stopping MDS when finding peer inode Yan, Zheng
2012-10-02 8:55 ` [PATCH 03/12] mds: Add finish callback to waiting_for_base_ino wait queue Yan, Zheng
2012-10-02 8:55 ` Yan, Zheng [this message]
2012-10-02 8:55 ` [PATCH 05/12] mds: Fix xlock imports Yan, Zheng
2012-10-02 8:55 ` [PATCH 06/12] mds: Set metablob.renamed_dirino in do_rename_rollback() Yan, Zheng
2012-10-02 8:55 ` [PATCH 07/12] mds: Avoid save unnecessary parent snaprealm Yan, Zheng
2012-10-02 8:55 ` [PATCH 08/12] mds: Allow export subtrees in other MDS' stray directory Yan, Zheng
2012-10-02 8:55 ` [PATCH 09/12] mds: Properly update dirty dir fragstat during log replay Yan, Zheng
2012-10-02 8:55 ` [PATCH 10/12] mds: Trim non auth subtree directory Yan, Zheng
2012-10-02 8:55 ` [PATCH 11/12] mds: Properly re-calculate mdsdir inode's auth bit Yan, Zheng
2012-10-02 8:55 ` [PATCH 12/12] mds: Avoid creating unnecessary snaprealm Yan, Zheng
2012-10-02 18:31 ` Sage Weil
2012-10-02 23:45 ` Yan, Zheng
2012-10-03 0:12 ` Sage Weil
2012-10-03 11:44 ` Yan, Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349168152-13281-4-git-send-email-zheng.z.yan@intel.com \
--to=zheng.z.yan@intel.com \
--cc=ceph-devel@vger.kernel.org \
--cc=sage@inktank.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.