Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-08 13:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor simplifications.

Browse source 
svn path=/trunk/; revision=11269
This commit is contained in:
Eric Kohl 2004-10-11 12:37:04 +00:00
parent e9542274b4
commit 2dea5c279b
2 changed files with 140 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
reactos/drivers/fs/np/create.c
View file

@ -1,4 +1,4 @@
/* $Id: create.c,v 1.22 2004/07/03 17:40:20 navaraf Exp $ /* $Id: create.c,v 1.23 2004/10/11 12:37:04 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -18,13 +18,59 @@
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
static PNPFS_PIPE
NpfsFindPipe(PNPFS_DEVICE_EXTENSION DeviceExt,
PUNICODE_STRING PipeName)
{
PLIST_ENTRY CurrentEntry;
PNPFS_PIPE Pipe;
CurrentEntry = DeviceExt->PipeListHead.Flink;
while (CurrentEntry != &DeviceExt->PipeListHead)
{
Pipe = CONTAINING_RECORD(CurrentEntry, NPFS_PIPE, PipeListEntry);
if (RtlCompareUnicodeString(PipeName,
&Pipe->PipeName,
TRUE) == 0)
{
DPRINT1("<%wZ> = <%wZ>\n", PipeName, &Pipe->PipeName);
return Pipe;
}
CurrentEntry = CurrentEntry->Flink;
}
return NULL;
}
static PNPFS_FCB
NpfsFindListeningServerInstance(PNPFS_PIPE Pipe)
{
PLIST_ENTRY CurrentEntry;
PNPFS_FCB ServerFcb;
CurrentEntry = Pipe->ServerFcbListHead.Flink;
while (CurrentEntry != &Pipe->ServerFcbListHead)
{
ServerFcb = CONTAINING_RECORD(CurrentEntry, NPFS_FCB, FcbListEntry);
if (ServerFcb->PipeState == FILE_PIPE_LISTENING_STATE)
{
DPRINT("Server found! Fcb %p\n", ServerFcb);
return ServerFcb;
}
CurrentEntry = CurrentEntry->Flink;
}
return NULL;
}
NTSTATUS STDCALL NTSTATUS STDCALL
NpfsCreate( NpfsCreate(
PDEVICE_OBJECT DeviceObject, PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
{ {
PLIST_ENTRY CurrentEntry;
PNPFS_PIPE Current;
PIO_STACK_LOCATION IoStack; PIO_STACK_LOCATION IoStack;
PFILE_OBJECT FileObject; PFILE_OBJECT FileObject;
PNPFS_PIPE Pipe; PNPFS_PIPE Pipe;
@ -49,23 +95,11 @@ NpfsCreate(
*/ */
KeLockMutex(&DeviceExt->PipeListLock); KeLockMutex(&DeviceExt->PipeListLock);
CurrentEntry = DeviceExt->PipeListHead.Flink; Pipe = NpfsFindPipe(DeviceExt,
while (CurrentEntry != &DeviceExt->PipeListHead) &FileObject->FileName);
if (Pipe == NULL)
{ {
Current = CONTAINING_RECORD(CurrentEntry, NPFS_PIPE, PipeListEntry);
if (RtlCompareUnicodeString(
&FileObject->FileName,
&Current->PipeName,
TRUE) == 0)
{
break;
}
CurrentEntry = CurrentEntry->Flink;
}
/* Not found, bail out with error. */ /* Not found, bail out with error. */
if (CurrentEntry == &DeviceExt->PipeListHead)
{
DPRINT("No pipe found!\n"); DPRINT("No pipe found!\n");
KeUnlockMutex(&DeviceExt->PipeListLock); KeUnlockMutex(&DeviceExt->PipeListLock);
Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND;
@ -75,9 +109,6 @@ NpfsCreate(
KeUnlockMutex(&DeviceExt->PipeListLock); KeUnlockMutex(&DeviceExt->PipeListLock);
/* Save the pipe we found for later use. */
Pipe = Current;
/* /*
* Step 2. Search for listening server FCB. * Step 2. Search for listening server FCB.
*/ */
@ -88,21 +119,10 @@ NpfsCreate(
*/ */
KeLockMutex(&Pipe->FcbListLock); KeLockMutex(&Pipe->FcbListLock);
CurrentEntry = Pipe->ServerFcbListHead.Flink; ServerFcb = NpfsFindListeningServerInstance(Pipe);
while (CurrentEntry != &Pipe->ServerFcbListHead) if (ServerFcb == NULL)
{ {
ServerFcb = CONTAINING_RECORD(CurrentEntry, NPFS_FCB, FcbListEntry);
if (ServerFcb->PipeState == FILE_PIPE_LISTENING_STATE)
{
DPRINT("Server found! Fcb %p\n", ServerFcb);
break;
}
CurrentEntry = CurrentEntry->Flink;
}
/* Not found, bail out with error for FILE_OPEN requests. */ /* Not found, bail out with error for FILE_OPEN requests. */
if (CurrentEntry == &Pipe->ServerFcbListHead)
{
DPRINT("No server fcb found!\n"); DPRINT("No server fcb found!\n");
if (Disposition == FILE_OPEN) if (Disposition == FILE_OPEN)
{ {
@ -111,7 +131,6 @@ NpfsCreate(
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
return STATUS_PIPE_BUSY; return STATUS_PIPE_BUSY;
} }
ServerFcb = NULL;
} }
/* /*
@ -463,7 +482,8 @@ NpfsClose(
/* FIXME: Clean up existing connections here ?? */ /* FIXME: Clean up existing connections here ?? */
DPRINT("Server\n"); DPRINT("Server\n");
Pipe->CurrentInstances--; Pipe->CurrentInstances--;
} else }
else
{ {
DPRINT("Client\n"); DPRINT("Client\n");
} }
@ -482,6 +502,7 @@ NpfsClose(
*/ */
KeSetEvent(&Fcb->OtherSide->Event, IO_NO_INCREMENT, FALSE); KeSetEvent(&Fcb->OtherSide->Event, IO_NO_INCREMENT, FALSE);
} }
#ifndef FIN_WORKAROUND_READCLOSE #ifndef FIN_WORKAROUND_READCLOSE
Fcb->PipeState = 0; Fcb->PipeState = 0;
#endif #endif
@ -507,9 +528,11 @@ NpfsClose(
ExFreePool(Fcb->OtherSide->Data); ExFreePool(Fcb->OtherSide->Data);
ExFreePool(Fcb->OtherSide); ExFreePool(Fcb->OtherSide);
} }
RemoveEntryList(&Fcb->FcbListEntry); RemoveEntryList(&Fcb->FcbListEntry);
if (Fcb->Data) if (Fcb->Data)
ExFreePool(Fcb->Data); ExFreePool(Fcb->Data);
ExFreePool(Fcb); ExFreePool(Fcb);
} }
#endif #endif

55
reactos/drivers/fs/np/fsctrl.c
View file

@ -1,4 +1,4 @@
/* $Id: fsctrl.c,v 1.15 2004/05/05 18:30:16 navaraf Exp $ /* $Id: fsctrl.c,v 1.16 2004/10/11 12:37:04 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -42,8 +42,8 @@ NpfsConnectPipe(PNPFS_FCB Fcb)
Pipe = Fcb->Pipe; Pipe = Fcb->Pipe;
/* search for a listening client fcb */ /* search for a listening client fcb */
KeLockMutex(&Pipe->FcbListLock); KeLockMutex(&Pipe->FcbListLock);
current_entry = Pipe->ClientFcbListHead.Flink; current_entry = Pipe->ClientFcbListHead.Flink;
while (current_entry != &Pipe->ClientFcbListHead) while (current_entry != &Pipe->ClientFcbListHead)
{ {
@ -52,14 +52,6 @@ NpfsConnectPipe(PNPFS_FCB Fcb)
FcbListEntry); FcbListEntry);
if (ClientFcb->PipeState == FILE_PIPE_LISTENING_STATE) if (ClientFcb->PipeState == FILE_PIPE_LISTENING_STATE)
{
break;
}
current_entry = current_entry->Flink;
}
if (current_entry != &Pipe->ClientFcbListHead)
{ {
/* found a listening client fcb */ /* found a listening client fcb */
DPRINT("Listening client fcb found -- connecting\n"); DPRINT("Listening client fcb found -- connecting\n");
@ -80,15 +72,17 @@ NpfsConnectPipe(PNPFS_FCB Fcb)
DPRINT("Setting the ConnectEvent for %x\n", ClientFcb); DPRINT("Setting the ConnectEvent for %x\n", ClientFcb);
KeSetEvent(&ClientFcb->ConnectEvent, IO_NO_INCREMENT, FALSE); KeSetEvent(&ClientFcb->ConnectEvent, IO_NO_INCREMENT, FALSE);
Status = STATUS_PIPE_CONNECTED; return STATUS_PIPE_CONNECTED;
}
current_entry = current_entry->Flink;
} }
else
{
/* no listening client fcb found */
DPRINT("No listening client fcb found -- waiting for client\n");
KeUnlockMutex(&Pipe->FcbListLock); KeUnlockMutex(&Pipe->FcbListLock);
/* no listening client fcb found */
DPRINT("No listening client fcb found -- waiting for client\n");
Fcb->PipeState = FILE_PIPE_LISTENING_STATE; Fcb->PipeState = FILE_PIPE_LISTENING_STATE;
Status = KeWaitForSingleObject(&Fcb->ConnectEvent, Status = KeWaitForSingleObject(&Fcb->ConnectEvent,
@ -96,19 +90,17 @@ NpfsConnectPipe(PNPFS_FCB Fcb)
KernelMode, KernelMode,
FALSE, FALSE,
NULL); NULL);
if (!NT_SUCCESS(Status))
if (NT_SUCCESS(Status))
{ {
Status = STATUS_PIPE_CONNECTED; DPRINT("KeWaitForSingleObject() failed (Status %lx)\n", Status);
Fcb->PipeState = FILE_PIPE_CONNECTED_STATE; return Status;
} }
DPRINT("Finished waiting! Status: %x\n", Status); Fcb->PipeState = FILE_PIPE_CONNECTED_STATE;
}
DPRINT("Client Fcb: %p\n", Fcb->OtherSide); DPRINT("Client Fcb: %p\n", Fcb->OtherSide);
return Status; return STATUS_PIPE_CONNECTED;
} }
@ -174,20 +166,16 @@ NpfsWaitPipe(PIRP Irp,
FcbListEntry); FcbListEntry);
if (ServerFcb->PipeState == FILE_PIPE_LISTENING_STATE) if (ServerFcb->PipeState == FILE_PIPE_LISTENING_STATE)
break;
current_entry = current_entry->Flink;
}
if (current_entry != &Pipe->ServerFcbListHead)
{ {
/* found a listening server fcb */ /* found a listening server fcb */
DPRINT("Listening server fcb found -- connecting\n"); DPRINT("Listening server fcb found -- connecting\n");
Status = STATUS_SUCCESS; return STATUS_SUCCESS;
} }
else
{ current_entry = current_entry->Flink;
}
/* no listening server fcb found -- wait for one */ /* no listening server fcb found -- wait for one */
Fcb->PipeState = FILE_PIPE_LISTENING_STATE; Fcb->PipeState = FILE_PIPE_LISTENING_STATE;
@ -196,9 +184,10 @@ NpfsWaitPipe(PIRP Irp,
KernelMode, KernelMode,
FALSE, FALSE,
&WaitPipe->Timeout); &WaitPipe->Timeout);
}
return(Status); DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status);
return Status;
} }