lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ceph: fix dentry leaks

Browse Source 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
This commit is contained in:
Yan, Zheng 2015-02-02 11:27:56 +08:00 committed by Ilya Dryomov
parent 3de22be677
commit 5cba372c0f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/ceph/dir.c
View File

@ -676,6 +676,7 @@ int ceph_handle_notrace_create(struct inode *dir, struct dentry *dentry)
*/
BUG_ON(!result->d_inode);
d_instantiate(dentry, result->d_inode);
d_drop(result);
return 0;
}
return PTR_ERR(result);

8
fs/ceph/inode.c
View File

@ -1449,12 +1449,14 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
}
if (!dn->d_inode) {
dn = splice_dentry(dn, in, NULL);
if (IS_ERR(dn)) {
err = PTR_ERR(dn);
struct dentry *realdn = splice_dentry(dn, in, NULL);
if (IS_ERR(realdn)) {
err = PTR_ERR(realdn);
d_drop(dn);
dn = NULL;
goto next_item;
}
dn = realdn;
}
di = dn->d_fsdata;