mirror of
https://github.com/ceph/ceph
synced 2025-03-11 02:39:05 +00:00
Merge remote-tracking branch 'upstream/pull/15758/head' into master
* upstream/pull/15758/head: mds: repeat dir->is_frozen in rdlock_path_xlock_dentry Reviewed-by: Zheng Yan <zyan@redhat.com>
This commit is contained in:
commit
c1590d7a1f
@ -2853,13 +2853,6 @@ CDentry* Server::rdlock_path_xlock_dentry(MDRequestRef& mdr, int n,
|
||||
if (!dir) return 0;
|
||||
dout(10) << "rdlock_path_xlock_dentry dir " << *dir << dendl;
|
||||
|
||||
// make sure we can auth_pin (or have already authpinned) dir
|
||||
if (dir->is_frozen()) {
|
||||
dout(7) << "waiting for !frozen/authpinnable on " << *dir << dendl;
|
||||
dir->add_waiter(CInode::WAIT_UNFREEZE, new C_MDS_RetryRequest(mdcache, mdr));
|
||||
return 0;
|
||||
}
|
||||
|
||||
CInode *diri = dir->get_inode();
|
||||
if (!mdr->reqid.name.is_mds()) {
|
||||
if (diri->is_system() && !diri->is_root()) {
|
||||
|
Loading…
Reference in New Issue
Block a user