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

Commit 8b895ce6 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Handle SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED status bit correctly. 



If the server tells us that only some state has been revoked, then we
need to run the full TEST_STATEID dog and pony show in order to discover
which locks and delegations are still OK. Currently we blow away all
state, which means that we lose all locks!

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent b5872f0c

fs/nfs/nfs4state.c

+13 −4
Original line number Diff line number Diff line
@@ -2191,12 +2191,20 @@ static void nfs41_handle_server_reboot(struct nfs_client *clp) 
	}

}



static void nfs41_handle_state_revoked(struct nfs_client *clp)

static void nfs41_handle_all_state_revoked(struct nfs_client *clp)

{

	nfs4_reset_all_state(clp);

	dprintk("%s: state revoked on server %s\n", __func__, clp->cl_hostname);

}



static void nfs41_handle_some_state_revoked(struct nfs_client *clp)

{

	nfs4_state_mark_reclaim_helper(clp, nfs4_state_mark_reclaim_nograce);

	nfs4_schedule_state_manager(clp);



	dprintk("%s: state revoked on server %s\n", __func__, clp->cl_hostname);

}



static void nfs41_handle_recallable_state_revoked(struct nfs_client *clp)

{

	/* This will need to handle layouts too */
@@ -2231,10 +2239,11 @@ void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags) 


	if (flags & SEQ4_STATUS_RESTART_RECLAIM_NEEDED)

		nfs41_handle_server_reboot(clp);

	if (flags & (SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED |

			    SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED |

	if (flags & (SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED))

		nfs41_handle_all_state_revoked(clp);

	if (flags & (SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED |

			    SEQ4_STATUS_ADMIN_STATE_REVOKED))

		nfs41_handle_state_revoked(clp);

		nfs41_handle_some_state_revoked(clp);

	if (flags & SEQ4_STATUS_LEASE_MOVED)

		nfs4_schedule_lease_moved_recovery(clp);

	if (flags & SEQ4_STATUS_RECALLABLE_STATE_REVOKED)