Skip to content

L
linux
Commit 5cba372c authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files
Options

ceph: fix dentry leaks 

Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
parent 3de22be6
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
fs/ceph/dir.c
View file @ 5cba372c
...@@ -676,6 +676,7 @@ int ceph_handle_notrace_create(struct inode *dir, struct dentry *dentry) ...@@ -676,6 +676,7 @@ int ceph_handle_notrace_create(struct inode *dir, struct dentry *dentry)
*/ */
BUG_ON(!result->d_inode); BUG_ON(!result->d_inode);
d_instantiate(dentry, result->d_inode); d_instantiate(dentry, result->d_inode);
d_drop(result);
return 0; return 0;
} }
return PTR_ERR(result); return PTR_ERR(result);
......
fs/ceph/inode.c
View file @ 5cba372c
...@@ -1449,12 +1449,14 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, ...@@ -1449,12 +1449,14 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
} }
if (!dn->d_inode) { if (!dn->d_inode) {
dn = splice_dentry(dn, in, NULL); struct dentry *realdn = splice_dentry(dn, in, NULL);
if (IS_ERR(dn)) { if (IS_ERR(realdn)) {
err = PTR_ERR(dn); err = PTR_ERR(realdn);
d_drop(dn);
dn = NULL; dn = NULL;
goto next_item; goto next_item;
} }
dn = realdn;
} }
di = dn->d_fsdata; di = dn->d_fsdata;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7