RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

mds: make migrate_stray() specify full path

Browse Source 
The handle_client_rename() check expects a full path rooted in the MDSDIR.
Do so in migrate_stray().

Also, use the committed (not projected) dn linkage; this was a carry-over
from the original switch to this API forever ago, but the current callers
don't need to migrate an uncommitted stray.  This also aligns us with
reintegrate_stray().

Reported-by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-10-03 09:12:40 -07:00
parent 9cabbb26c1
commit 2de5670583
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mds/MDCache.cc
View File

@ -8306,16 +8306,20 @@ void MDCache::reintegrate_stray(CDentry *straydn, CDentry *rdn)
void MDCache::migrate_stray(CDentry *dn, int to)
{
CInode *fromino = dn->dir->get_inode();
dout(10) << "migrate_stray from mds"
<< MDS_INO_STRAY_OWNER(fromino->inode.ino) << " to mds." << to
<< " " << *dn << " " << *dn->get_projected_linkage()->get_inode() << dendl;
CInode *in = dn->get_linkage()->get_inode();
assert(in);
CInode *diri = dn->dir->get_inode();
assert(diri->is_stray());
dout(10) << "migrate_stray from mds." << MDS_INO_STRAY_OWNER(diri->inode.ino)
<< " to mds." << to
<< " " << *dn << " " << *in << dendl;
// rename it to another mds.
string dname;
dn->get_projected_linkage()->get_inode()->name_stray_dentry(dname);
filepath src;
dn->make_path(src);
filepath src(dname, fromino->inode.ino);
string dname;
in->name_stray_dentry(dname);
filepath dst(dname, MDS_INO_STRAY(to, 0));
MClientRequest *req = new MClientRequest(CEPH_MDS_OP_RENAME);