Unverified Commit a475c87b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5277 [sync] PR-5246: ceph: fix deadlock or deadcode of misusing dget() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5246 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/26Y7OAUI7KUC32Q67MIQLSF2BAQDWGN5/ 
 
https://gitee.com/src-openeuler/kernel/issues/I96G92 
 
Link:https://gitee.com/openeuler/kernel/pulls/5277

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 0bf2f9e0 825e32d8

fs/ceph/caps.c

+3 −6
Original line number Diff line number Diff line
@@ -4532,12 +4532,14 @@ int ceph_encode_dentry_release(void **p, struct dentry *dentry, 
			       struct inode *dir,

			       int mds, int drop, int unless)

{

	struct dentry *parent = NULL;

	struct ceph_mds_request_release *rel = *p;

	struct ceph_dentry_info *di = ceph_dentry(dentry);

	int force = 0;

	int ret;



	/* This shouldn't happen */

	BUG_ON(!dir);



	/*

	 * force an record for the directory caps if we have a dentry lease.

	 * this is racy (can't take i_ceph_lock and d_lock together), but it
@@ -4547,14 +4549,9 @@ int ceph_encode_dentry_release(void **p, struct dentry *dentry, 
	spin_lock(&dentry->d_lock);

	if (di->lease_session && di->lease_session->s_mds == mds)

		force = 1;

	if (!dir) {

		parent = dget(dentry->d_parent);

		dir = d_inode(parent);

	}

	spin_unlock(&dentry->d_lock);



	ret = ceph_encode_inode_release(p, dir, mds, drop, unless, force);

	dput(parent);



	spin_lock(&dentry->d_lock);

	if (ret && di->lease_session && di->lease_session->s_mds == mds) {