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

rmdir: use normal delete upcall instead of close

Browse source 
caused memory leaks of nfs41_open_state.  we have the FileDispositionInformation upcall for exactly this, so there's no need to complicate the close code path

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2010-10-12 09:59:34 -04:00
parent d1169b1f6b
commit 5dc1b43191
2 changed files with 4 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
daemon/open.c
View file

@ -431,8 +431,7 @@ int handle_close(nfs41_upcall *upcall)
}
}
if (args->state->type == NF4REG || !args->remove)
free_open_state(state->session, state);
free_open_state(state->session, state);
if (status || !rm_status)
return status;
else

24
sys/nfs41_driver.c
View file

@ -3580,29 +3580,11 @@ NTSTATUS nfs41_SetFileInformation (
(PFILE_DISPOSITION_INFORMATION)RxContext->Info.Buffer;
if (dinfo->DeleteFile) {
// we can delete directories right away
if (nfs41_fcb->StandardInfo.Directory) {
status = nfs41_UpcallCreate(NFS41_CLOSE, &entry);
if (status)
goto out;
entry->u.Close.open_state = nfs41_fobx->nfs41_open_state;
entry->u.Close.session = pVNetRootContext->session;
entry->u.Close.remove = 1;
entry->u.Close.renamed = nfs41_fcb->Renamed;
entry->u.Close.filename = GET_ALREADY_PREFIXED_NAME_FROM_CONTEXT(RxContext);
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
status = STATUS_INTERNAL_ERROR;
goto out;
}
/* map windows ERRORs to NTSTATUS */
status = map_close_errors(entry->status);
RxFreePool(entry);
goto out;
}
if (nfs41_fcb->StandardInfo.Directory)
break;
nfs41_fcb->Flags = 0;
nfs41_fcb->StandardInfo.DeletePending = TRUE;
if (RxContext->pFcb->OpenCount > 1 && !nfs41_fcb->StandardInfo.Directory) {
if (RxContext->pFcb->OpenCount > 1) {
rinfo.ReplaceIfExists = 0;
rinfo.RootDirectory = INVALID_HANDLE_VALUE;
rinfo.FileNameLength = 0;