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

recovery: client keeps list of associated open state

Browse source 
open state is added to the client's list on a successful call to nfs41_open(), and removed from the list on nfs41_close() regardless of success

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2010-11-15 14:27:50 -05:00 • committed by unknown
parent 3ca917f6b3
commit 7240c69b5d
3 changed files with 44 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
daemon/open.c
View file

@ -73,6 +73,7 @@ out_free:
goto out;
}
/* open state reference counting */
void nfs41_open_state_ref(
IN nfs41_open_state *state)
{
@ -94,6 +95,28 @@ void nfs41_open_state_deref(
}
/* client list of associated open state */
static void client_state_add(
IN nfs41_open_state *state)
{
nfs41_client *client = state->session->client;
EnterCriticalSection(&client->state.lock);
list_add_tail(&client->state.opens, &state->client_entry);
LeaveCriticalSection(&client->state.lock);
}
static void client_state_remove(
IN nfs41_open_state *state)
{
nfs41_client *client = state->session->client;
EnterCriticalSection(&client->state.lock);
list_remove(&state->client_entry);
LeaveCriticalSection(&client->state.lock);
}
/* NFS41_OPEN */
static int parse_open(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall)
{
@ -395,6 +418,9 @@ static int handle_open(nfs41_upcall *upcall)
args->mode, state, &info);
if (status == NFS4_OK) {
/* add to the client's list of state for recovery */
client_state_add(state);
nfs_to_basic_info(&info, &args->basic_info);
nfs_to_standard_info(&info, &args->std_info);
state->do_close = 1;
@ -468,6 +494,9 @@ static void cancel_open(IN nfs41_upcall *upcall)
if (status)
dprintf(1, "cancel_open: nfs41_close() failed with %s\n",
nfs_error_string(status));
/* remove from the client's list of state for recovery */
client_state_remove(state);
} else if (args->created) {
const nfs41_component *name = &state->file.name;
status = nfs41_remove(state->session, &state->parent, name);
@ -545,6 +574,9 @@ static int handle_close(nfs41_upcall *upcall)
nfs_error_string(status));
status = nfs_to_windows_error(status, ERROR_INTERNAL_ERROR);
}
/* remove from the client's list of state for recovery */
client_state_remove(state);
}
if (status || !rm_status)