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

close file before remove in case of silly rename

Browse source 
windows server does not allow for removing of opened file and instead
errors with nfs41err_file_open. we were failing the remove the silly
renamed file.
This commit is contained in:
Olga Kornievskaia 2011-12-14 13:11:06 -05:00
parent 6292181f8d
commit 8e64984183
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
daemon/open.c
View file

@ -713,6 +713,25 @@ out:
return status; return status;
} }
static int do_nfs41_close(nfs41_open_state *state)
{
int status;
stateid_arg stateid;
stateid.open = state;
stateid.delegation = NULL;
stateid.type = STATEID_OPEN;
memcpy(&stateid.stateid, &state->stateid, sizeof(stateid4));
status = nfs41_close(state->session, &state->file, &stateid);
if (status) {
dprintf(1, "nfs41_close() failed with error %s.\n",
nfs_error_string(status));
status = nfs_to_windows_error(status, ERROR_INTERNAL_ERROR);
}
return status;
}
static int handle_close(nfs41_upcall *upcall) static int handle_close(nfs41_upcall *upcall)
{ {
int status = NFS4_OK, rm_status = NFS4_OK; int status = NFS4_OK, rm_status = NFS4_OK;
@ -729,6 +748,11 @@ static int handle_close(nfs41_upcall *upcall)
if (args->renamed) { if (args->renamed) {
dprintf(1, "removing a renamed file %s\n", name->name); dprintf(1, "removing a renamed file %s\n", name->name);
create_silly_rename(&state->path, &state->file.fh, name); create_silly_rename(&state->path, &state->file.fh, name);
status = do_nfs41_close(state);
if (status)
goto out;
else
state->do_close = 0;
} }
/* break any delegations and truncate before REMOVE */ /* break any delegations and truncate before REMOVE */
@ -746,20 +770,9 @@ static int handle_close(nfs41_upcall *upcall)
} }
if (state->do_close) { if (state->do_close) {
stateid_arg stateid; status = do_nfs41_close(state);
stateid.open = state;
stateid.delegation = NULL;
stateid.type = STATEID_OPEN;
memcpy(&stateid.stateid, &state->stateid, sizeof(stateid4));
status = nfs41_close(state->session, &state->file, &stateid);
if (status) {
dprintf(1, "nfs41_close() failed with error %s.\n",
nfs_error_string(status));
status = nfs_to_windows_error(status, ERROR_INTERNAL_ERROR);
}
} }
out:
/* remove from the client's list of state for recovery */ /* remove from the client's list of state for recovery */
client_state_remove(state); client_state_remove(state);