Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cd420e5 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFSv4: Fix second deadlock in nfs4_evict_inode() 



commit c3aba897c6e67fa464ec02b1f17911577d619713 upstream.

If the inode is being evicted but has to return a layout first, then
that too can cause a deadlock in the corner case where the server
reboots.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 42c10b0d

fs/nfs/nfs4proc.c

+7 −2
Original line number Diff line number Diff line
@@ -9067,15 +9067,20 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync) 
			&task_setup_data.rpc_client, &msg);



	dprintk("--> %s\n", __func__);

	if (!sync) {

	lrp->inode = nfs_igrab_and_active(lrp->args.inode);

	if (!sync) {

		if (!lrp->inode) {

			nfs4_layoutreturn_release(lrp);

			return -EAGAIN;

		}

		task_setup_data.flags |= RPC_TASK_ASYNC;

	}

	nfs4_init_sequence(&lrp->args.seq_args, &lrp->res.seq_res, 1, 0);

	if (!lrp->inode)

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

				   1);

	else

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

				   0);

	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task))

		return PTR_ERR(task);