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

!14740 NFSv4: Fix deadlock during the running of state manager 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CERVAQ4NLQMS555WPUU5SR4O5MV67YN3/ 
 
https://gitee.com/openeuler/kernel/issues/IBAFF1 
 
Link:https://gitee.com/openeuler/kernel/pulls/14740

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 5f36bb46 36c15d51

fs/nfs/nfs4proc.c

+2 −1
Original line number Diff line number Diff line
@@ -6295,7 +6295,8 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, co 
		data->lr.roc = false;

	}



	if (!data->inode)

	if (!data->inode ||

	    test_bit(NFS4CLNT_RECLAIM_REBOOT, &server->nfs_client->cl_state))

		nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1,

				   1);

	else