ceph: fix dentry leaks
Signed-off-by: Yan, Zheng <zyan@redhat.com>
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 709f3b9..77eeb76 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -676,6 +676,7 @@
*/
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 f88a0f0..be3af18 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1449,12 +1449,14 @@
}
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;