summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorYan, Zheng <zyan@redhat.com>2015-02-02 11:27:56 +0800
committerIlya Dryomov <idryomov@gmail.com>2015-02-19 13:31:40 +0300
commit5cba372c0fe78d24e83d9e0556ecbeb219625c15 (patch)
treedcb8742257a0243d9afbe157cb6f6222afd98371 /fs
parent3de22be6771353241eaec237fe594dfea3daf30f (diff)
downloadlinux-5cba372c0fe78d24e83d9e0556ecbeb219625c15.tar.bz2
ceph: fix dentry leaks
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/dir.c1
-rw-r--r--fs/ceph/inode.c8
2 files changed, 6 insertions, 3 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 709f3b98ca5c..77eeb768f95a 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -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);
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index f88a0f059dc8..be3af18e4cf1 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1449,12 +1449,14 @@ retry_lookup:
}
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;