RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-14 23:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

uclient: don't unlink null dentry when getting null linkage in mds reply

Browse Source 
This broke semi-recently when the mds started returning null linkages (and
associated leases).
This commit is contained in:
Sage Weil 2010-05-22 09:56:27 -07:00
parent bf1cb87d25
commit f7708dea1f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/Client.cc
View File

@ -645,7 +645,8 @@ Inode* Client::insert_trace(MetaRequest *request, utime_t from, int mds)
Dentry *dn = NULL;
if (diri->dir && diri->dir->dentries.count(dname)) {
dn = diri->dir->dentries[dname];
unlink(dn, false);
if (dn->inode)
unlink(dn, false);
}
}
} else if (reply->head.op == CEPH_MDS_OP_LOOKUPSNAP ||
@ -669,7 +670,8 @@ Inode* Client::insert_trace(MetaRequest *request, utime_t from, int mds)
Dentry *dn = NULL;
if (diri->dir && diri->dir->dentries.count(dname)) {
dn = diri->dir->dentries[dname];
unlink(dn, false);
if (dn->inode)
unlink(dn, false);
}
}
}