evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

recovery: only reclaim delegations on RECALLABLE_STATE_REVOKED

Browse source 
when only the SEQ4_STATUS_RECALLABLE_STATE_REVOKED flag is set, we only have to test/free delegation stateids.  nfs41_client_state_revoked() handles this by calling stateid_array() with an empty list of opens

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2011-12-19 16:05:03 -05:00 • committed by unknown
parent 6c1c300a3b
commit f14231fd3b
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
daemon/recovery.c
View file

@ -107,7 +107,8 @@ void nfs41_recover_sequence_flags(
const uint32_t revoked = flags & const uint32_t revoked = flags &
(SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED (SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED
| SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED | SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED
| SEQ4_STATUS_ADMIN_STATE_REVOKED); | SEQ4_STATUS_ADMIN_STATE_REVOKED
| SEQ4_STATUS_RECALLABLE_STATE_REVOKED);
const uint32_t restarted = flags & const uint32_t restarted = flags &
SEQ4_STATUS_RESTART_RECLAIM_NEEDED; SEQ4_STATUS_RESTART_RECLAIM_NEEDED;
@ -635,6 +636,7 @@ void nfs41_client_state_revoked(
{ {
const struct cb_layoutrecall_args recall = { PNFS_LAYOUTTYPE_FILE, const struct cb_layoutrecall_args recall = { PNFS_LAYOUTTYPE_FILE,
PNFS_IOMODE_ANY, TRUE, { PNFS_RETURN_ALL } }; PNFS_IOMODE_ANY, TRUE, { PNFS_RETURN_ALL } };
struct list_entry empty, *opens;
struct client_state *clientstate = &session->client->state; struct client_state *clientstate = &session->client->state;
stateid_arg *stateids = NULL; stateid_arg *stateids = NULL;
uint32_t *statuses = NULL; uint32_t *statuses = NULL;
@ -644,9 +646,17 @@ void nfs41_client_state_revoked(
EnterCriticalSection(&clientstate->lock); EnterCriticalSection(&clientstate->lock);
if (revoked == SEQ4_STATUS_RECALLABLE_STATE_REVOKED) {
/* only delegations were revoked. use an empty list for opens */
list_init(&empty);
opens = &empty;
} else {
opens = &clientstate->opens;
}
/* get an array of the client's stateids */ /* get an array of the client's stateids */
count = stateid_array(&clientstate->delegations, count = stateid_array(&clientstate->delegations,
&clientstate->opens, &stateids, &statuses); opens, &stateids, &statuses);
if (count == 0) if (count == 0)
goto out; goto out;