ceph: fix dentry leaks

Signed-off-by: Yan, Zheng <zyan@redhat.com>
mariux64 · Feb 19, 2015 · 5cba372 · 5cba372
1 parent 3de22be
commit 5cba372
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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;