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

ceph: fix dentry leaks 



Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
parent 3de22be6

fs/ceph/dir.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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

+5 −3
Original line number Original line Diff line number Diff line
@@ -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;