RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 18:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: do not manually clean up on unlink/rmdir

Browse Source 
The reply handler will do this in a safe, ordered fashion.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-05-16 13:49:58 -07:00 committed by Yan, Zheng
parent 727ad64871
commit 627e644c35
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/Client.cc
View File

@ -7956,13 +7956,6 @@ int Client::_unlink(Inode *dir, const char *name, int uid, int gid)
req->set_inode(dir);
res = make_request(req, uid, gid);
if (res == 0) {
if (dir->dir && dir->dir->dentries.count(name)) {
Dentry *dn = dir->dir->dentries[name];
unlink(dn, false, false);
}
}
ldout(cct, 10) << "unlink result is " << res << dendl;
trim_cache();
ldout(cct, 3) << "unlink(" << path << ") = " << res << dendl;
@ -8018,15 +8011,6 @@ int Client::_rmdir(Inode *dir, const char *name, int uid, int gid)
req->set_inode(in);
res = make_request(req, uid, gid);
if (res == 0) {
if (dir->dir && dir->dir->dentries.count(name) ) {
Dentry *dn = dir->dir->dentries[name];
if (dn->inode->dir && dn->inode->dir->is_empty() &&
(dn->inode->dn_set.size() == 1))
close_dir(dn->inode->dir); // FIXME: maybe i shoudl proactively hose the whole subtree from cache?
unlink(dn, false, false);
}
}
trim_cache();
ldout(cct, 3) << "rmdir(" << path << ") = " << res << dendl;