Commit 23ea44c2 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFSv4.1: Fix a regression in DELEGRETURN 



We don't want to call nfs4_free_revoked_stateid() in the case where
the delegreturn was successful.

Reported-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 62bdf94a

fs/nfs/nfs4proc.c

+3 −2
Original line number Diff line number Diff line
@@ -5569,6 +5569,7 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) 
	switch (task->tk_status) {

	case 0:

		renew_lease(data->res.server, data->timestamp);

		break;

	case -NFS4ERR_ADMIN_REVOKED:

	case -NFS4ERR_DELEG_REVOKED:

	case -NFS4ERR_EXPIRED:
@@ -5579,8 +5580,6 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) 
	case -NFS4ERR_OLD_STATEID:

	case -NFS4ERR_STALE_STATEID:

		task->tk_status = 0;

		if (data->roc)

			pnfs_roc_set_barrier(data->inode, data->roc_barrier);

		break;

	default:

		if (nfs4_async_handle_error(task, data->res.server,
@@ -5590,6 +5589,8 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) 
		}

	}

	data->rpc_status = task->tk_status;

	if (data->roc && data->rpc_status == 0)

		pnfs_roc_set_barrier(data->inode, data->roc_barrier);

}



static void nfs4_delegreturn_release(void *calldata)