Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[ion] 22775: - NtLockFile: - Add proper sync operation. - Set the APC Routine/Context in the IRP instead of ignoring them. - Dereference the event on failure. - Set the allocated buffer as AuxiliaryBuffer so the I/O manager fres it.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 23:01:17 2006 New Revision: 22775 URL: http://svn.reactos.org/svn/reactos?rev=22775&view=rev Log: - NtLockFile: - Add proper sync operation. - Set the APC Routine/Context in the IRP instead of ignoring them. - Dereference the event on failure. - Set the allocated buffer as AuxiliaryBuffer so the I/O manager fres it. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Jul 2 23:01:17 2006 @@ -1059,7 +1059,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -1074,19 +1074,18 @@ IN BOOLEAN FailImmediately, IN BOOLEAN ExclusiveLock) { - PFILE_OBJECT FileObject = NULL; + PFILE_OBJECT FileObject; PLARGE_INTEGER LocalLength = NULL; PIRP Irp = NULL; PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; PKEVENT Event = NULL; - BOOLEAN LocalEvent = FALSE; + BOOLEAN LockedForSync = FALSE; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); LARGE_INTEGER CapturedByteOffset, CapturedLength; NTSTATUS Status = STATUS_SUCCESS; OBJECT_HANDLE_INFORMATION HandleInformation; PAGED_CODE(); - CapturedByteOffset.QuadPart = 0; CapturedLength.QuadPart = 0; @@ -1099,96 +1098,83 @@ &HandleInformation); if (!NT_SUCCESS(Status)) return Status; + /* Check if we're called from user mode */ if (PreviousMode != KernelMode) { - /* Must have either FILE_READ_DATA or FILE_WRITE_DATA access unless - we're in KernelMode! */ - if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) - { - DPRINT1("Invalid access rights\n"); + /* Must have either FILE_READ_DATA or FILE_WRITE_DATA access */ + if (!(HandleInformation.GrantedAccess & + (FILE_WRITE_DATA | FILE_READ_DATA))) + { ObDereferenceObject(FileObject); return STATUS_ACCESS_DENIED; } + /* Enter SEH for probing */ _SEH_TRY { + /* Probe the I/O STatus block */ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); + + /* Probe and capture the large integers */ CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); CapturedLength = ProbeForReadLargeInteger(Length); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Check if probing failed */ if (!NT_SUCCESS(Status)) { + /* Dereference the object and return exception code */ ObDereferenceObject(FileObject); return Status; } } else { + /* Otherwise, capture them directly */ CapturedByteOffset = *ByteOffset; CapturedLength = *Length; } - /* Get Event Object */ + /* Check if we have an event handle */ if (EventHandle) { + /* Reference it */ Status = ObReferenceObjectByHandle(EventHandle, EVENT_MODIFY_STATE, ExEventObjectType, PreviousMode, (PVOID *)&Event, NULL); - if (Status != STATUS_SUCCESS) return(Status); + if (Status != STATUS_SUCCESS) return Status; KeClearEvent(Event); } - /* Check if this is a direct open or not */ - if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) - { - DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); - } - else - { - DeviceObject = IoGetRelatedDeviceObject(FileObject); - } + /* Get the device object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); - } - else - { - LocalEvent = TRUE; - } + /* Lock it */ + IopLockFileObject(FileObject); + LockedForSync = TRUE; + } + + /* Clear File Object event */ + KeClearEvent(&FileObject->Event); + FileObject->LockOperation = TRUE; /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Allocate local buffer */ - LocalLength = ExAllocatePoolWithTag(NonPagedPool, - sizeof(LARGE_INTEGER), - TAG_LOCK); - if (!LocalLength) - { - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - *LocalLength = CapturedLength; + if (!Irp) return IopCleanupFailedIrp(FileObject, Event); /* Set up the IRP */ Irp->RequestorMode = PreviousMode; @@ -1196,6 +1182,8 @@ Irp->UserEvent = Event; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; + Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; /* Set up Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -1203,7 +1191,24 @@ StackPtr->MinorFunction = IRP_MN_LOCK; StackPtr->FileObject = FileObject; + /* Allocate local buffer */ + LocalLength = ExAllocatePoolWithTag(NonPagedPool, + sizeof(LARGE_INTEGER), + TAG_LOCK); + if (!LocalLength) + { + /* Fail */ + IoFreeIrp(Irp); + if (Event) ObDereferenceObject(Event); + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Set the length */ + *LocalLength = CapturedLength; + /* Set Parameters */ + Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength; StackPtr->Parameters.LockControl.Length = LocalLength; StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset; StackPtr->Parameters.LockControl.Key = Key; @@ -1212,24 +1217,14 @@ if (FailImmediately) StackPtr->Flags = SL_FAIL_IMMEDIATELY; if (ExclusiveLock) StackPtr->Flags |= SL_EXCLUSIVE_LOCK; - /* Call the Driver */ - FileObject->LockOperation = TRUE; - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - if (!LocalEvent) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = FileObject->FinalStatus; - } - } - - /* Return the Status */ - return Status; + /* Perform the call */ + return IopPerformSynchronousRequest(DeviceObject, + Irp, + FileObject, + FALSE, + PreviousMode, + LockedForSync, + IopOtherTransfer); } /*

18 years, 5 months

[ion] 22774: - Temporarily disable queueing IRPs to their threads, since raising to APC_LEVEL seems to cause some weird user-mode exceptions.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 22:47:54 2006 New Revision: 22774 URL: http://svn.reactos.org/svn/reactos?rev=22774&view=rev Log: - Temporarily disable queueing IRPs to their threads, since raising to APC_LEVEL seems to cause some weird user-mode exceptions. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Jul 2 22:47:54 2006 @@ -156,7 +156,7 @@ PAGED_CODE(); /* Queue the IRP */ - IopQueueIrpToThread(Irp); + //IopQueueIrpToThread(Irp); /* Update operation counts */ IopUpdateOperationCount(TransferType); @@ -478,7 +478,7 @@ } /* Queue the IRP */ - IopQueueIrpToThread(Irp); + //IopQueueIrpToThread(Irp); /* Call the Driver */ Status = IoCallDriver(FileObject->DeviceObject, Irp); @@ -735,7 +735,7 @@ StackPtr->Parameters.SetFile.Length = Length; /* Queue the IRP */ - IopQueueIrpToThread(Irp); + //IopQueueIrpToThread(Irp); /* Call the Driver */ Status = IoCallDriver(FileObject->DeviceObject, Irp); Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c Sun Jul 2 22:47:54 2006 @@ -895,8 +895,8 @@ KIRQL OldIrql; ULONG Retries = 3000; LARGE_INTEGER Interval; - //PLIST_ENTRY ListHead, NextEntry; - //PIRP Irp; + PLIST_ENTRY ListHead, NextEntry; + PIRP Irp; IOTRACE(IO_IRP_DEBUG, "%s - Canceling IRPs for Thread %p\n", __FUNCTION__, @@ -906,7 +906,6 @@ OldIrql = KfRaiseIrql(APC_LEVEL); /* Start by cancelling all the IRPs in the current thread queue. */ -#if 0 ListHead = &Thread->IrpList; NextEntry = ListHead->Flink; while (ListHead != NextEntry) @@ -920,7 +919,6 @@ /* Move to the next entry */ NextEntry = NextEntry->Flink; } -#endif /* Wait 100 milliseconds */ Interval.QuadPart = -1000000;

18 years, 5 months

[hpoussin] 22773: Implement IopReinitializeBootDrivers, on the model of IopReinitializeDrivers

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jul 2 22:34:21 2006 New Revision: 22773 URL: http://svn.reactos.org/svn/reactos?rev=22773&view=rev Log: Implement IopReinitializeBootDrivers, on the model of IopReinitializeDrivers Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jul 2 22:34:21 2006 @@ -810,6 +810,12 @@ VOID ); +VOID +FASTCALL +IopReinitializeBootDrivers( + VOID +); + // // File Routines // Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Jul 2 22:34:21 2006 @@ -79,7 +79,7 @@ PUNICODE_STRING ModuleName, PLDR_DATA_TABLE_ENTRY *ModuleObject); -VOID +static VOID FASTCALL INIT_FUNCTION IopDisplayLoadingMessage(PVOID ServiceName, @@ -493,8 +493,6 @@ DPRINT("RtlQueryRegistryValues() failed (Status %x)\n", Status); return Status; } - - //IopDisplayLoadingMessage(ServiceName->Buffer, TRUE); /* * Normalize the image path for all later processing. @@ -1702,6 +1700,50 @@ } } +VOID FASTCALL +IopReinitializeBootDrivers(VOID) +{ + PDRIVER_REINIT_ITEM ReinitItem; + PLIST_ENTRY Entry; + KIRQL Irql; + + KeAcquireSpinLock(&DriverBootReinitListLock, + &Irql); + + DriverBootReinitTailEntry = IsListEmpty(&DriverBootReinitListHead) ? NULL : DriverBootReinitListHead.Blink; + Entry = DriverBootReinitTailEntry; + + KeReleaseSpinLock(&DriverBootReinitListLock, + Irql); + + if (Entry == NULL) + { + return; + } + + for (;;) + { + Entry = ExInterlockedRemoveHeadList(&DriverBootReinitListHead, + &DriverBootReinitListLock); + if (Entry == NULL) + return; + + ReinitItem = (PDRIVER_REINIT_ITEM)CONTAINING_RECORD(Entry, DRIVER_REINIT_ITEM, ItemEntry); + + /* Increment reinitialization counter */ + ReinitItem->DriverObject->DriverExtension->Count++; + + ReinitItem->ReinitRoutine(ReinitItem->DriverObject, + ReinitItem->Context, + ReinitItem->DriverObject->DriverExtension->Count); + + ExFreePool(Entry); + + if (Entry == DriverBootReinitTailEntry) + return; + } +} + /* PUBLIC FUNCTIONS ***********************************************************/ @@ -2110,7 +2152,7 @@ ExInterlockedInsertTailList( &DriverBootReinitListHead, &ReinitItem->ItemEntry, - &DriverReinitListLock); + &DriverBootReinitListLock); } /* Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Sun Jul 2 22:34:21 2006 @@ -470,6 +470,9 @@ IopInitializeSystemDrivers(); IoDestroyDriverList(); + /* Call back drivers that asked for */ + IopReinitializeBootDrivers(); + /* Stop boot logging */ IopStopBootLog();

18 years, 5 months

[ion] 22772: - Move NtCancelIoFile and NtDeleteFile to file.c, they don't deal with IRPs. - Create IopFinalizeAsynchronousIo to deal with Sync APIs working on Async file objects, which need to be waited on differently and have the IOSB copied manually. - Update NtFlushBuffersFile to new semantics (ie, usage of the new implemented functions).

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 22:20:37 2006 New Revision: 22772 URL: http://svn.reactos.org/svn/reactos?rev=22772&view=rev Log: - Move NtCancelIoFile and NtDeleteFile to file.c, they don't deal with IRPs. - Create IopFinalizeAsynchronousIo to deal with Sync APIs working on Async file objects, which need to be waited on differently and have the IOSB copied manually. - Update NtFlushBuffersFile to new semantics (ie, usage of the new implemented functions). Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sun Jul 2 22:20:37 2006 @@ -1469,6 +1469,141 @@ FileInformation); } +/** + * @name NtCancelIoFile + * + * Cancel all pending I/O operations in the current thread for specified + * file object. + * + * @param FileHandle + * Handle to file object to cancel requests for. No specific + * access rights are needed. + * @param IoStatusBlock + * Pointer to status block which is filled with final completition + * status on successful return. + * + * @return Status. + * + * @implemented + */ +NTSTATUS +NTAPI +NtCancelIoFile(IN HANDLE FileHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock) +{ + PFILE_OBJECT FileObject; + PETHREAD Thread; + PIRP Irp; + KIRQL OldIrql; + BOOLEAN OurIrpsInList = FALSE; + LARGE_INTEGER Interval; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* IRP cancellations are synchronized at APC_LEVEL. */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* + * Walk the list of active IRPs and cancel the ones that belong to + * our file object. + */ + + Thread = PsGetCurrentThread(); + + LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) + { + if (Irp->Tail.Overlay.OriginalFileObject == FileObject) + { + IoCancelIrp(Irp); + /* Don't break here, we want to cancel all IRPs for the file object. */ + OurIrpsInList = TRUE; + } + } + + KfLowerIrql(OldIrql); + + while (OurIrpsInList) + { + OurIrpsInList = FALSE; + + /* Wait a short while and then look if all our IRPs were completed. */ + Interval.QuadPart = -1000000; /* 100 milliseconds */ + KeDelayExecutionThread(KernelMode, FALSE, &Interval); + + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* + * Look in the list if all IRPs for the specified file object + * are completed (or cancelled). If someone sends a new IRP + * for our file object while we're here we can happily loop + * forever. + */ + + LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) + { + if (Irp->Tail.Overlay.OriginalFileObject == FileObject) + { + OurIrpsInList = TRUE; + break; + } + } + + KfLowerIrql(OldIrql); + } + + _SEH_TRY + { + IoStatusBlock->Status = STATUS_SUCCESS; + IoStatusBlock->Information = 0; + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + + } + _SEH_END; + + ObDereferenceObject(FileObject); + return Status; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtDeleteFile(IN POBJECT_ATTRIBUTES ObjectAttributes) +{ + UNIMPLEMENTED; + return(STATUS_NOT_IMPLEMENTED); +} + /* * @unimplemented */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Jul 2 22:20:37 2006 @@ -89,6 +89,54 @@ /* We got preempted, so give up */ KeLowerIrql(OldIrql); } +} + +NTSTATUS +NTAPI +IopFinalizeAsynchronousIo(IN NTSTATUS SynchStatus, + IN PKEVENT Event, + IN PIRP Irp, + IN KPROCESSOR_MODE PreviousMode, + IN PIO_STATUS_BLOCK KernelIosb, + OUT PIO_STATUS_BLOCK IoStatusBlock) +{ + NTSTATUS FinalStatus = SynchStatus; + PAGED_CODE(); + + /* Make sure the IRP was completed, but returned pending */ + if (FinalStatus == STATUS_PENDING) + { + /* Wait for the IRP */ + FinalStatus = KeWaitForSingleObject(Event, + Executive, + PreviousMode, + FALSE, + NULL); + if (FinalStatus == STATUS_USER_APC) + { + /* Abort the request */ + IopAbortInterruptedIrp(Event, Irp); + } + + /* Set the final status */ + FinalStatus = KernelIosb->Status; + } + + /* Wrap potential user-mode write in SEH */ + _SEH_TRY + { + *IoStatusBlock = *KernelIosb; + } + _SEH_HANDLE + { + /* Get the exception code */ + FinalStatus = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Free the event and return status */ + ExFreePool(Event); + return FinalStatus; } NTSTATUS @@ -734,141 +782,6 @@ /* NATIVE SERVICES ***********************************************************/ -/** - * @name NtCancelIoFile - * - * Cancel all pending I/O operations in the current thread for specified - * file object. - * - * @param FileHandle - * Handle to file object to cancel requests for. No specific - * access rights are needed. - * @param IoStatusBlock - * Pointer to status block which is filled with final completition - * status on successful return. - * - * @return Status. - * - * @implemented - */ -NTSTATUS -NTAPI -NtCancelIoFile(IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock) -{ - PFILE_OBJECT FileObject; - PETHREAD Thread; - PIRP Irp; - KIRQL OldIrql; - BOOLEAN OurIrpsInList = FALSE; - LARGE_INTEGER Interval; - KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) return Status; - } - - Status = ObReferenceObjectByHandle(FileHandle, - 0, - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* IRP cancellations are synchronized at APC_LEVEL. */ - OldIrql = KfRaiseIrql(APC_LEVEL); - - /* - * Walk the list of active IRPs and cancel the ones that belong to - * our file object. - */ - - Thread = PsGetCurrentThread(); - - LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) - { - if (Irp->Tail.Overlay.OriginalFileObject == FileObject) - { - IoCancelIrp(Irp); - /* Don't break here, we want to cancel all IRPs for the file object. */ - OurIrpsInList = TRUE; - } - } - - KfLowerIrql(OldIrql); - - while (OurIrpsInList) - { - OurIrpsInList = FALSE; - - /* Wait a short while and then look if all our IRPs were completed. */ - Interval.QuadPart = -1000000; /* 100 milliseconds */ - KeDelayExecutionThread(KernelMode, FALSE, &Interval); - - OldIrql = KfRaiseIrql(APC_LEVEL); - - /* - * Look in the list if all IRPs for the specified file object - * are completed (or cancelled). If someone sends a new IRP - * for our file object while we're here we can happily loop - * forever. - */ - - LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) - { - if (Irp->Tail.Overlay.OriginalFileObject == FileObject) - { - OurIrpsInList = TRUE; - break; - } - } - - KfLowerIrql(OldIrql); - } - - _SEH_TRY - { - IoStatusBlock->Status = STATUS_SUCCESS; - IoStatusBlock->Information = 0; - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - - } - _SEH_END; - - ObDereferenceObject(FileObject); - return Status; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -NtDeleteFile(IN POBJECT_ATTRIBUTES ObjectAttributes) -{ - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); -} - /* * @implemented */ @@ -933,32 +846,36 @@ NtFlushBuffersFile(IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock) { - PFILE_OBJECT FileObject = NULL; + PFILE_OBJECT FileObject; PIRP Irp; PIO_STACK_LOCATION StackPtr; NTSTATUS Status = STATUS_SUCCESS; PDEVICE_OBJECT DeviceObject; - KEVENT Event; + PKEVENT Event = NULL; BOOLEAN LocalEvent = FALSE; - ACCESS_MASK DesiredAccess = FILE_WRITE_DATA; OBJECT_HANDLE_INFORMATION ObjectHandleInfo; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + IO_STATUS_BLOCK KernelIosb; PAGED_CODE(); if (PreviousMode != KernelMode) { + /* Protect probes */ _SEH_TRY { + /* Probe the I/O Status block */ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Return exception code, if any */ if (!NT_SUCCESS(Status)) return Status; } @@ -969,58 +886,55 @@ PreviousMode, (PVOID*)&FileObject, &ObjectHandleInfo); - if (!NT_SUCCESS(Status)) return(Status); - - /* check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was - granted. However, if this is a named pipe, make sure we don't ask for - FILE_APPEND_DATA as it interferes with the FILE_CREATE_PIPE_INSTANCE - access right! */ - if (!(FileObject->Flags & FO_NAMED_PIPE)) - DesiredAccess |= FILE_APPEND_DATA; - if (!RtlAreAnyAccessesGranted(ObjectHandleInfo.GrantedAccess, - DesiredAccess)) - { + if (!NT_SUCCESS(Status)) return Status; + + /* + * Check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was + * granted. However, if this is a named pipe, make sure we don't ask for + * FILE_APPEND_DATA as it interferes with the FILE_CREATE_PIPE_INSTANCE + * access right! + */ + if (!(ObjectHandleInfo.GrantedAccess & + ((!(FileObject->Flags & FO_NAMED_PIPE) ? FILE_APPEND_DATA : 0) | + FILE_WRITE_DATA))) + { + /* We failed */ ObDereferenceObject(FileObject); return STATUS_ACCESS_DENIED; } - /* Check if this is a direct open or not */ - if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) - { - DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); - } - else - { - DeviceObject = IoGetRelatedDeviceObject(FileObject); - } - /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); + /* Lock it */ + IopLockFileObject(FileObject); } else { /* Use local event */ - KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + KeInitializeEvent(Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } + /* Get the Device Object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* Clear the event */ + KeClearEvent(&FileObject->Event); + /* Allocate the IRP */ - if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); /* Set up the IRP */ Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->UserIosb = (LocalEvent) ? &KernelIosb : IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? Event : NULL; Irp->RequestorMode = PreviousMode; - Irp->UserIosb = IoStatusBlock; - Irp->UserEvent = (LocalEvent) ? &Event : NULL; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; /* Set up Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -1028,27 +942,24 @@ StackPtr->FileObject = FileObject; /* Call the Driver */ - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - if (LocalEvent) - { - KeWaitForSingleObject(&Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock->Status; - } - else - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = FileObject->FinalStatus; - } + Status = IopPerformSynchronousRequest(DeviceObject, + Irp, + FileObject, + FALSE, + PreviousMode, + !LocalEvent, + IopOtherTransfer); + + /* Check if this was async I/O */ + if (LocalEvent) + { + /* It was, finalize this request */ + Status = IopFinalizeAsynchronousIo(Status, + Event, + Irp, + PreviousMode, + &KernelIosb, + IoStatusBlock); } /* Return the Status */

18 years, 5 months

[ion] 22771: - Same changes for IoSertInformation: Lock the FO, queue the IRP, support alerted I/O, etc...

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 20:41:49 2006 New Revision: 22771 URL: http://svn.reactos.org/svn/reactos?rev=22771&view=rev Log: - Same changes for IoSertInformation: Lock the FO, queue the IRP, support alerted I/O, etc... Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Jul 2 20:41:49 2006 @@ -635,59 +635,100 @@ PIRP Irp; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; + BOOLEAN LocalEvent = FALSE; + KEVENT Event; NTSTATUS Status; - - if (FileInformationClass == FileCompletionInformation) - { - return STATUS_NOT_IMPLEMENTED; - } - - Status = ObReferenceObjectByPointer(FileObject, - 0, /* FIXME - depends on the information class */ - IoFileObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) return(Status); - - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (!Irp) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Trigger FileObject/Event dereferencing */ + PAGED_CODE(); + + /* Reference the object */ + ObReferenceObject(FileObject); + + /* Check if this is a file that was opened for Synch I/O */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Lock it */ + IopLockFileObject(FileObject); + + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + /* Use local event */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } + + /* Get the Device Object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* Allocate the IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + + /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = KernelMode; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? &Event : NULL; + Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->Flags |= IRP_BUFFERED_IO; Irp->AssociatedIrp.SystemBuffer = FileInformation; - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = &FileObject->Event; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - KeResetEvent( &FileObject->Event ); - + + /* Set the Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; StackPtr->FileObject = FileObject; + + /* Set Parameters */ StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass; StackPtr->Parameters.SetFile.Length = Length; + /* Queue the IRP */ + IopQueueIrpToThread(Irp); + + /* Call the Driver */ Status = IoCallDriver(FileObject->DeviceObject, Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, + + /* Check if this was synch I/O */ + if (!LocalEvent) + { + /* Check if the requet is pending */ + if (Status == STATUS_PENDING) + { + /* Wait on the file object */ + Status = KeWaitForSingleObject(&FileObject->Event, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + if (Status == STATUS_ALERTED) + { + /* Abort the operation */ + IopAbortInterruptedIrp(&FileObject->Event, Irp); + } + + /* Get the final status */ + Status = FileObject->FinalStatus; + } + + /* Release the file lock */ + IopUnlockFileObject(FileObject); + } + else if (Status == STATUS_PENDING) + { + /* Wait on the local event and get the final status */ + KeWaitForSingleObject(&Event, Executive, KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, + FALSE, NULL); Status = IoStatusBlock.Status; } + /* Return the status */ return Status; }

18 years, 5 months

[ion] 22770: - Combine IoQueryVolumeInformation and IoQueryFileInformation - Fix them to lock the fileobject for synch operations, use IopCleanupFailedIrp, queue the IRP in the thread's list, support aborting the I/o operation through IopAbortInterruptedIrp, and properly wait for comlpetion.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 20:35:05 2006 New Revision: 22770 URL: http://svn.reactos.org/svn/reactos?rev=22770&view=rev Log: - Combine IoQueryVolumeInformation and IoQueryFileInformation - Fix them to lock the fileobject for synch operations, use IopCleanupFailedIrp, queue the IRP in the thread's list, support aborting the I/o operation through IopAbortInterruptedIrp, and properly wait for comlpetion. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Jul 2 20:35:05 2006 @@ -356,6 +356,128 @@ NTSTATUS NTAPI +IopQueryDeviceInformation(IN PFILE_OBJECT FileObject, + IN ULONG InformationClass, + IN ULONG Length, + OUT PVOID Information, + OUT PULONG ReturnedLength, + IN BOOLEAN File) +{ + IO_STATUS_BLOCK IoStatusBlock; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + PIO_STACK_LOCATION StackPtr; + BOOLEAN LocalEvent = FALSE; + KEVENT Event; + NTSTATUS Status; + PAGED_CODE(); + + /* Reference the object */ + ObReferenceObject(FileObject); + + /* Check if this is a file that was opened for Synch I/O */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Lock it */ + IopLockFileObject(FileObject); + + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + /* Use local event */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } + + /* Get the Device Object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* Allocate the IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + + /* Set the IRP */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? &Event : NULL; + Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->Flags |= IRP_BUFFERED_IO; + Irp->AssociatedIrp.SystemBuffer = Information; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + /* Set the Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = File ? IRP_MJ_QUERY_INFORMATION: + IRP_MJ_QUERY_VOLUME_INFORMATION; + StackPtr->FileObject = FileObject; + + /* Check which type this is */ + if (File) + { + /* Set Parameters */ + StackPtr->Parameters.QueryFile.FileInformationClass = InformationClass; + StackPtr->Parameters.QueryFile.Length = Length; + } + else + { + /* Set Parameters */ + StackPtr->Parameters.QueryVolume.FsInformationClass = InformationClass; + StackPtr->Parameters.QueryVolume.Length = Length; + } + + /* Queue the IRP */ + IopQueueIrpToThread(Irp); + + /* Call the Driver */ + Status = IoCallDriver(FileObject->DeviceObject, Irp); + + /* Check if this was synch I/O */ + if (!LocalEvent) + { + /* Check if the requet is pending */ + if (Status == STATUS_PENDING) + { + /* Wait on the file object */ + Status = KeWaitForSingleObject(&FileObject->Event, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + if (Status == STATUS_ALERTED) + { + /* Abort the operation */ + IopAbortInterruptedIrp(&FileObject->Event, Irp); + } + + /* Get the final status */ + Status = FileObject->FinalStatus; + } + + /* Release the file lock */ + IopUnlockFileObject(FileObject); + } + else if (Status == STATUS_PENDING) + { + /* Wait on the local event and get the final status */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* Return the Length and Status. ReturnedLength is NOT optional */ + *ReturnedLength = IoStatusBlock.Information; + return Status; +} + +NTSTATUS +NTAPI IopQueryDirectoryFileCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) @@ -470,85 +592,13 @@ OUT PVOID FileInformation, OUT PULONG ReturnedLength) { - IO_STATUS_BLOCK IoStatusBlock; - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PIO_STACK_LOCATION StackPtr; - BOOLEAN LocalEvent = FALSE; - KEVENT Event; - NTSTATUS Status; - - Status = ObReferenceObjectByPointer(FileObject, - FILE_READ_ATTRIBUTES, - IoFileObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) return(Status); - - /* Get the Device Object */ - DeviceObject = IoGetRelatedDeviceObject(FileObject); - - /* Check if we should use Sync IO or not */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); - } - else - { - /* Use local event */ - KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - LocalEvent = TRUE; - } - - /* Allocate the IRP */ - Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - - /* Set the IRP */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = KernelMode; - Irp->AssociatedIrp.SystemBuffer = FileInformation; - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = (LocalEvent) ? &Event : NULL; - Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - /* Set the Stack Data */ - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; - StackPtr->FileObject = FileObject; - - /* Set Parameters */ - StackPtr->Parameters.QueryFile.FileInformationClass = FileInformationClass; - StackPtr->Parameters.QueryFile.Length = Length; - - /* Call the Driver */ - Status = IoCallDriver(FileObject->DeviceObject, Irp); - - if (Status == STATUS_PENDING) - { - if (LocalEvent) - { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock.Status; - } - else - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = FileObject->FinalStatus; - } - } - - /* Return the Length and Status. ReturnedLength is NOT optional */ - *ReturnedLength = IoStatusBlock.Information; - return Status; + /* Call the shared routine */ + return IopQueryDeviceInformation(FileObject, + FileInformationClass, + Length, + FileInformation, + ReturnedLength, + TRUE); } /* @@ -562,60 +612,13 @@ OUT PVOID FsInformation, OUT PULONG ReturnedLength) { - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status; - - Status = ObReferenceObjectByPointer(FileObject, - FILE_READ_ATTRIBUTES, - IoFileObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) return(Status); - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (!Irp) - { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = KernelMode; - Irp->AssociatedIrp.SystemBuffer = FsInformation; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = &IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.QueryVolume.Length = Length; - StackPtr->Parameters.QueryVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock.Status; - } - - if (ReturnedLength) *ReturnedLength = IoStatusBlock.Information; - return Status; + /* Call the shared routine */ + return IopQueryDeviceInformation(FileObject, + FsInformationClass, + Length, + FsInformation, + ReturnedLength, + FALSE); } /*

18 years, 5 months

[ion] 22769: - Start of heavy work on iofunc.c: - Created our new friends: IopCleanupFailedIrp, IopAbortInterruptedIrp, IopPerformSynchronousRequest, IopLockFileObject, IopUnlockFileObject, IopQueueIrpToThread, IopUpdateOperationCount. - What does this mean: We actually queue IRPs to their thread! We actually respect I/O transfers being interrupted/alerted! We actually respect I/O operation counts! We actually LOCK FILE OBJECTS instead of randomly using them! We now support Deferred (read: MUCH

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 20:20:10 2006 New Revision: 22769 URL: http://svn.reactos.org/svn/reactos?rev=22769&view=rev Log: - Start of heavy work on iofunc.c: - Created our new friends: IopCleanupFailedIrp, IopAbortInterruptedIrp, IopPerformSynchronousRequest, IopLockFileObject, IopUnlockFileObject, IopQueueIrpToThread, IopUpdateOperationCount. - What does this mean: We actually queue IRPs to their thread! We actually respect I/O transfers being interrupted/alerted! We actually respect I/O operation counts! We actually LOCK FILE OBJECTS instead of randomly using them! We now support Deferred (read: MUCH faster) I/O completion. - First function blessed: IopDeviceFsIoControl. - Also simplified access rights check and fixedup some formatting. Added: trunk/reactos/ntoskrnl/include/internal/io_x.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jul 2 20:20:10 2006 @@ -5,7 +5,6 @@ * PURPOSE: Internal header for the I/O Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -//#include "io_x.h" #include "ntdddisk.h" // @@ -192,6 +191,16 @@ IopRemove, IopAdd } IOP_DEVICE_LIST_OPERATION, *PIOP_DEVICE_LIST_OPERATION; + +// +// Transfer statistics +// +typedef enum _IOP_TRANSFER_TYPE +{ + IopReadTransfer, + IopWriteTransfer, + IopOtherTransfer +} IOP_TRANSFER_TYPE, *PIOP_TRANSFER_TYPE; // // Special version of the IRP Overlay used to optimize I/O completion @@ -674,6 +683,19 @@ ); // +// I/O Completion +// +VOID +NTAPI +IopCompleteRequest( + IN PKAPC Apc, + IN PKNORMAL_ROUTINE* NormalRoutine, + IN PVOID* NormalContext, + IN PVOID* SystemArgument1, + IN PVOID* SystemArgument2 +); + +// // Error Logging Routines // VOID @@ -949,3 +971,8 @@ extern PDEVICE_NODE IopRootDeviceNode; extern ULONG IopTraceLevel; extern NPAGED_LOOKASIDE_LIST IopMdlLookasideList; + +// +// Inlined Functions +// +#include "io_x.h" Added: trunk/reactos/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io_x.h (added) +++ trunk/reactos/ntoskrnl/include/internal/io_x.h Sun Jul 2 20:20:10 2006 @@ -1,0 +1,78 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/include/io_x.h +* PURPOSE: Internal Inlined Functions for the I/O Manager +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +VOID +static __inline +IopLockFileObject(IN PFILE_OBJECT FileObject) +{ + /* Lock the FO and check for contention */ + if (InterlockedExchange(&FileObject->Busy, TRUE)) + { + /* FIXME: Implement contention case */ + KEBUGCHECK(0); + } +} + +VOID +static __inline +IopUnlockFileObject(IN PFILE_OBJECT FileObject) +{ + /* Unlock the FO and wake any waiters up */ + InterlockedExchange(&FileObject->Busy, FALSE); + if (FileObject->Waiters) KeSetEvent(&FileObject->Lock, 0, FALSE); +} + +VOID +static __inline +IopQueueIrpToThread(IN PIRP Irp) +{ + KIRQL OldIrql; + + /* Raise to APC Level */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + + /* Insert it into the list */ + InsertHeadList(&Irp->Tail.Overlay.Thread->IrpList, &Irp->ThreadListEntry); + + /* Lower irql */ + KeLowerIrql(OldIrql); +} + +VOID +static __inline +IopUpdateOperationCount(IN IOP_TRANSFER_TYPE Type) +{ + PLARGE_INTEGER CountToChange; + + /* Make sure I/O operations are being counted */ + if (IoCountOperations) + { + if (Type == IopReadTransfer) + { + /* Increase read count */ + IoReadOperationCount++; + CountToChange = &PsGetCurrentProcess()->ReadOperationCount; + } + else if (Type == IopWriteTransfer) + { + /* Increase write count */ + IoWriteOperationCount++; + CountToChange = &PsGetCurrentProcess()->ReadOperationCount; + } + else + { + /* Increase other count */ + IoOtherOperationCount++; + CountToChange = &PsGetCurrentProcess()->ReadOperationCount; + } + + /* Increase the process-wide count */ + ExInterlockedAddLargeStatistic(CountToChange, 1); + } +} + Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Sun Jul 2 20:20:10 2006 @@ -5,8 +5,6 @@ * PURPOSE: Internal header for the Object Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -#include "ob_x.h" - // // Define this if you want debugging support // @@ -323,3 +321,9 @@ extern WORK_QUEUE_ITEM ObpReaperWorkItem; extern volatile PVOID ObpReaperList; extern NPAGED_LOOKASIDE_LIST ObpNmLookasideList, ObpCiLookasideList; +extern BOOLEAN IoCountOperations; + +// +// Inlined Functions +// +#include "ob_x.h" Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Jul 2 20:20:10 2006 @@ -23,14 +23,145 @@ /* PRIVATE FUNCTIONS *********************************************************/ +/* DON'T inline this: it's a failure case */ NTSTATUS NTAPI -IopQueryDirectoryFileCompletion(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - ExFreePool(Context); - return STATUS_SUCCESS; +IopCleanupFailedIrp(IN PFILE_OBJECT FileObject, + IN PKEVENT EventObject) +{ + PAGED_CODE(); + + /* Dereference the event */ + if (EventObject) ObDereferenceObject(EventObject); + + /* If this was a file opened for synch I/O, then unlock it */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) IopUnlockFileObject(FileObject); + + /* Now dereference it and return */ + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; +} + +/* DON'T inline this: it's a failure case */ +VOID +NTAPI +IopAbortInterruptedIrp(IN PKEVENT EventObject, + IN PIRP Irp) +{ + KIRQL OldIrql; + BOOLEAN CancelResult; + LARGE_INTEGER Wait; + PAGED_CODE(); + + /* Raise IRQL to APC */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + + /* Check if nobody completed it yet */ + if (!KeReadStateEvent(EventObject)) + { + /* First, cancel it */ + CancelResult = IoCancelIrp(Irp); + KeLowerIrql(OldIrql); + + /* Check if we cancelled it */ + if (CancelResult) + { + /* Wait for the IRP to be cancelled */ + Wait.QuadPart = -100000; + while (!KeReadStateEvent(EventObject)) + { + /* Delay indefintely */ + KeDelayExecutionThread(KernelMode, FALSE, &Wait); + } + } + else + { + /* No cancellation done, so wait for the I/O system to kill it */ + KeWaitForSingleObject(EventObject, + Executive, + KernelMode, + FALSE, + NULL); + } + } + else + { + /* We got preempted, so give up */ + KeLowerIrql(OldIrql); + } +} + +NTSTATUS +NTAPI +IopPerformSynchronousRequest(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PFILE_OBJECT FileObject, + IN BOOLEAN Deferred, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SynchIo, + IN IOP_TRANSFER_TYPE TransferType) +{ + NTSTATUS Status; + PKNORMAL_ROUTINE NormalRoutine; + PVOID NormalContext; + KIRQL OldIrql; + PAGED_CODE(); + + /* Queue the IRP */ + IopQueueIrpToThread(Irp); + + /* Update operation counts */ + IopUpdateOperationCount(TransferType); + + /* Call the driver */ + Status = IoCallDriver(DeviceObject, Irp); + + /* Check if we're optimizing this case */ + if (Deferred) + { + /* We are! Check if the IRP wasn't completed */ + if (Status != STATUS_PENDING) + { + /* Complete it ourselves */ + ASSERT(!Irp->PendingReturned); + KeRaiseIrql(APC_LEVEL, &OldIrql); + IopCompleteRequest(&Irp->Tail.Apc, + &NormalRoutine, + &NormalContext, + (PVOID*)&FileObject, + &NormalContext); + KeLowerIrql(OldIrql); + } + } + + /* Check if this was synch I/O */ + if (SynchIo) + { + /* Make sure the IRP was completed, but returned pending */ + if (Status == STATUS_PENDING) + { + /* Wait for the IRP */ + Status = KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + (FileObject->Flags & FO_ALERTABLE_IO), + NULL); + if ((Status == STATUS_ALERTED) || (Status == STATUS_USER_APC)) + { + /* Abort the request */ + IopAbortInterruptedIrp(&FileObject->Event, Irp); + } + + /* Set the final status */ + Status = FileObject->FinalStatus; + } + + /* Release the file lock */ + IopUnlockFileObject(FileObject); + } + + /* Return status */ + return Status; } NTSTATUS @@ -45,7 +176,7 @@ IN ULONG InputBufferLength OPTIONAL, OUT PVOID OutputBuffer, IN ULONG OutputBufferLength OPTIONAL, - BOOLEAN IsDevIoCtl) + IN BOOLEAN IsDevIoCtl) { NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject; @@ -53,54 +184,65 @@ PIRP Irp; PIO_STACK_LOCATION StackPtr; PKEVENT EventObject = NULL; - BOOLEAN LocalEvent = FALSE; + BOOLEAN LockedForSynch = FALSE; ULONG AccessType; OBJECT_HANDLE_INFORMATION HandleInformation; + ACCESS_MASK DesiredAccess; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + /* Get the access type */ AccessType = IO_METHOD_FROM_CTL_CODE(IoControlCode); + /* Check if we came from user mode */ if (PreviousMode != KernelMode) { _SEH_TRY { + /* Probe the status block */ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); - /* probe the input and output buffers if needed */ + /* Check if this is buffered I/O */ if (AccessType == METHOD_BUFFERED) { - if (OutputBuffer != NULL) + /* Check if we have an output buffer */ + if (OutputBuffer) { + /* Probe the output buffer */ ProbeForWrite(OutputBuffer, OutputBufferLength, 1); } else { - /* make sure the caller can't fake this as we depend on this */ + /* Make sure the caller can't fake this as we depend on this */ OutputBufferLength = 0; } } + /* Check if we we have an input buffer I/O */ if (AccessType != METHOD_NEITHER) { - if (InputBuffer != NULL) + /* Check if we have an input buffer */ + if (InputBuffer) { + /* Probe the input buffer */ ProbeForRead(InputBuffer, InputBufferLength, 1); } else { - /* make sure the caller can't fake this as we depend on this */ + /* Make sure the caller can't fake this as we depend on this */ InputBufferLength = 0; } } } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Fail if we got an access violation */ if (!NT_SUCCESS(Status)) return Status; } @@ -113,15 +255,18 @@ &HandleInformation); if (!NT_SUCCESS(Status)) return Status; - /* Check for sufficient access rights */ + /* Check if we from user mode */ if (PreviousMode != KernelMode) { - ACCESS_MASK DesiredAccess = (ACCESS_MASK)((IoControlCode >> 14) & 3); - if (DesiredAccess != FILE_ANY_ACCESS && - !RtlAreAllAccessesGranted(HandleInformation.GrantedAccess, - (ACCESS_MASK)((IoControlCode >> 14) & 3))) - { - ObDereferenceObject (FileObject); + /* Get the access mask */ + DesiredAccess = (ACCESS_MASK)((IoControlCode >> 14) & 3); + + /* Check if we can open it */ + if ((DesiredAccess != FILE_ANY_ACCESS) && + (HandleInformation.GrantedAccess & DesiredAccess) != DesiredAccess) + { + /* Dereference the file object and fail */ + ObDereferenceObject(FileObject); return STATUS_ACCESS_DENIED; } } @@ -138,7 +283,8 @@ NULL); if (!NT_SUCCESS(Status)) { - ObDereferenceObject (FileObject); + /* Dereference the file object and fail */ + ObDereferenceObject(FileObject); return Status; } @@ -146,27 +292,30 @@ KeClearEvent(EventObject); } + /* Check if this is a file that was opened for Synch I/O */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Lock it */ + IopLockFileObject(FileObject); + + /* Remember to unlock later */ + LockedForSynch = TRUE; + } + /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { + /* It's a direct open, get the attached device */ DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); } else { + /* Otherwise get the related device */ DeviceObject = IoGetRelatedDeviceObject(FileObject); } - /* Check if we should use Sync IO or not */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); - } - else - { - /* Use local event */ - LocalEvent = TRUE; - } + /* Clear the event */ + KeClearEvent(&FileObject->Event); /* Build the IRP */ Irp = IoBuildDeviceIoControlRequest(IoControlCode, @@ -178,14 +327,10 @@ FALSE, EventObject, IoStatusBlock); - if (!Irp) - { - if (EventObject) ObDereferenceObject(EventObject); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } + if (!Irp) return IopCleanupFailedIrp(FileObject, Event); /* Set some extra settings */ + Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID) NULL; Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = PreviousMode; Irp->Overlay.AsynchronousParameters.UserApcRoutine = UserApcRoutine; @@ -196,23 +341,27 @@ IRP_MJ_DEVICE_CONTROL : IRP_MJ_FILE_SYSTEM_CONTROL; - /* Call the Driver */ - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - if (!LocalEvent) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = FileObject->FinalStatus; - } - } - - /* Return the Status */ - return Status; + /* Use deferred completion for FS I/O */ + Irp->Flags |= (!IsDevIoCtl) ? IRP_DEFER_IO_COMPLETION : 0; + + /* Perform the call */ + return IopPerformSynchronousRequest(DeviceObject, + Irp, + FileObject, + !IsDevIoCtl, + PreviousMode, + LockedForSynch, + IopOtherTransfer); +} + +NTSTATUS +NTAPI +IopQueryDirectoryFileCompletion(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + ExFreePool(Context); + return STATUS_SUCCESS; } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Sun Jul 2 20:20:10 2006 @@ -20,6 +20,7 @@ POBJECT_TYPE IoDeviceObjectType = NULL; POBJECT_TYPE IoFileObjectType = NULL; extern POBJECT_TYPE IoControllerObjectType; +BOOLEAN IoCountOperations; ULONG IoReadOperationCount = 0; LARGE_INTEGER IoReadTransferCount = {{0, 0}}; ULONG IoWriteOperationCount = 0; Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c Sun Jul 2 20:20:10 2006 @@ -849,13 +849,13 @@ { KIRQL OldIrql; PDRIVER_CANCEL CancelRoutine; - - /* Acquire the cancel lock and cancel the IRP */ IOTRACE(IO_IRP_DEBUG, "%s - Canceling IRP %p\n", __FUNCTION__, Irp); - + ASSERT(Irp->Type == IO_TYPE_IRP); + + /* Acquire the cancel lock and cancel the IRP */ IoAcquireCancelSpinLock(&OldIrql); Irp->Cancel = TRUE; @@ -892,10 +892,11 @@ NTAPI IoCancelThreadIo(IN PETHREAD Thread) { - PIRP Irp; KIRQL OldIrql; ULONG Retries = 3000; LARGE_INTEGER Interval; + //PLIST_ENTRY ListHead, NextEntry; + //PIRP Irp; IOTRACE(IO_IRP_DEBUG, "%s - Canceling IRPs for Thread %p\n", __FUNCTION__, @@ -905,11 +906,21 @@ OldIrql = KfRaiseIrql(APC_LEVEL); /* Start by cancelling all the IRPs in the current thread queue. */ - LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) - { +#if 0 + ListHead = &Thread->IrpList; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the IRP */ + Irp = CONTAINING_RECORD(NextEntry, IRP, ThreadListEntry); + /* Cancel it */ IoCancelIrp(Irp); - } + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + } +#endif /* Wait 100 milliseconds */ Interval.QuadPart = -1000000; @@ -1462,24 +1473,13 @@ NTAPI IoQueueThreadIrp(IN PIRP Irp) { - KIRQL OldIrql; IOTRACE(IO_IRP_DEBUG, "%s - Queueing IRP %p\n", __FUNCTION__, Irp); - /* Raise to APC */ - OldIrql = KfRaiseIrql(APC_LEVEL); - - /* - * Synchronous irp's are queued to requestor thread. If they are not - * completed when the thread exits, they are canceled (cleaned up). - * - Gunnar - */ - InsertTailList(&Irp->Tail.Overlay.Thread->IrpList, &Irp->ThreadListEntry); - - /* Lower back */ - KfLowerIrql(OldIrql); + /* Use our inlined routine */ + IopQueueIrpToThread(Irp); } /*

18 years, 5 months

[ion] 22768: - Fix formatting of some newly added functions before starting heavy work.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 18:26:25 2006 New Revision: 22768 URL: http://svn.reactos.org/svn/reactos?rev=22768&view=rev Log: - Fix formatting of some newly added functions before starting heavy work. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Jul 2 18:26:25 2006 @@ -405,159 +405,138 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI IoQueryVolumeInformation(IN PFILE_OBJECT FileObject, - IN FS_INFORMATION_CLASS FsInformationClass, - IN ULONG Length, - OUT PVOID FsInformation, - OUT PULONG ReturnedLength) + IN FS_INFORMATION_CLASS FsInformationClass, + IN ULONG Length, + OUT PVOID FsInformation, + OUT PULONG ReturnedLength) { - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status; - - ASSERT(FsInformation != NULL); - - DPRINT("FsInformation %p\n", FsInformation); - - Status = ObReferenceObjectByPointer(FileObject, - FILE_READ_ATTRIBUTES, - IoFileObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = KernelMode; - Irp->AssociatedIrp.SystemBuffer = FsInformation; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = &IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.QueryVolume.Length = Length; - StackPtr->Parameters.QueryVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject, - Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock.Status; - } - DPRINT("Status %x\n", Status); - - if (ReturnedLength != NULL) - { - *ReturnedLength = IoStatusBlock.Information; - } - - return(Status); + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION StackPtr; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status; + + Status = ObReferenceObjectByPointer(FileObject, + FILE_READ_ATTRIBUTES, + IoFileObjectType, + KernelMode); + if (!NT_SUCCESS(Status)) return(Status); + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if (!Irp) + { + ObDereferenceObject(FileObject); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->AssociatedIrp.SystemBuffer = FsInformation; + KeResetEvent( &FileObject->Event ); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = &IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.QueryVolume.Length = Length; + StackPtr->Parameters.QueryVolume.FsInformationClass = + FsInformationClass; + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + UserRequest, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + if (ReturnedLength) *ReturnedLength = IoStatusBlock.Information; + return Status; } /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI IoSetInformation(IN PFILE_OBJECT FileObject, - IN FILE_INFORMATION_CLASS FileInformationClass, - IN ULONG Length, - IN PVOID FileInformation) + IN FILE_INFORMATION_CLASS FileInformationClass, + IN ULONG Length, + IN PVOID FileInformation) { - IO_STATUS_BLOCK IoStatusBlock; - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PIO_STACK_LOCATION StackPtr; - NTSTATUS Status; - - ASSERT(FileInformation != NULL); - - if (FileInformationClass == FileCompletionInformation) - { - return STATUS_NOT_IMPLEMENTED; - } - - - - Status = ObReferenceObjectByPointer(FileObject, - 0, /* FIXME - depends on the information class */ - IoFileObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DPRINT("FileObject 0x%p\n", FileObject); - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = KernelMode; - Irp->AssociatedIrp.SystemBuffer = FileInformation; - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = &FileObject->Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - KeResetEvent( &FileObject->Event ); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass; - StackPtr->Parameters.SetFile.Length = Length; - - Status = IoCallDriver(FileObject->DeviceObject, Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock.Status; - } - - return Status; + IO_STATUS_BLOCK IoStatusBlock; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + PIO_STACK_LOCATION StackPtr; + NTSTATUS Status; + + if (FileInformationClass == FileCompletionInformation) + { + return STATUS_NOT_IMPLEMENTED; + } + + Status = ObReferenceObjectByPointer(FileObject, + 0, /* FIXME - depends on the information class */ + IoFileObjectType, + KernelMode); + if (!NT_SUCCESS(Status)) return(Status); + + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if (!Irp) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->AssociatedIrp.SystemBuffer = FileInformation; + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = &FileObject->Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + KeResetEvent( &FileObject->Event ); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass; + StackPtr->Parameters.SetFile.Length = Length; + + Status = IoCallDriver(FileObject->DeviceObject, Irp); + if (Status==STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = IoStatusBlock.Status; + } + + return Status; } /* NATIVE SERVICES ***********************************************************/ @@ -1324,7 +1303,6 @@ } } - return Status; Cleanup: @@ -1767,7 +1745,7 @@ IN PULONG Key OPTIONAL) { UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); + return STATUS_NOT_IMPLEMENTED; } /* @@ -2281,15 +2259,15 @@ */ NTSTATUS NTAPI -NtWriteFile (IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID Buffer, - IN ULONG Length, - IN PLARGE_INTEGER ByteOffset OPTIONAL, - IN PULONG Key OPTIONAL) +NtWriteFile(IN HANDLE FileHandle, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID Buffer, + IN ULONG Length, + IN PLARGE_INTEGER ByteOffset OPTIONAL, + IN PULONG Key OPTIONAL) { OBJECT_HANDLE_INFORMATION ObjectHandleInfo; NTSTATUS Status = STATUS_SUCCESS; @@ -2322,7 +2300,7 @@ DesiredAccess |= FILE_APPEND_DATA; /* Validate User-Mode Buffers */ - if(PreviousMode != KernelMode) + if (PreviousMode != KernelMode) { /* check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was granted. */ @@ -2494,74 +2472,44 @@ OUT PIO_STATUS_BLOCK UserIoStatusBlock, IN FILE_SEGMENT_ELEMENT BufferDescription [], IN ULONG BufferLength, - IN PLARGE_INTEGER ByteOffset, + IN PLARGE_INTEGER ByteOffset, IN PULONG Key OPTIONAL) { UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); + return STATUS_NOT_IMPLEMENTED; } /* - * FUNCTION: Queries the volume information - * ARGUMENTS: - * FileHandle = Handle to a file object on the target volume - * ReturnLength = DataWritten - * FsInformation = Caller should supply storage for the information - * structure. - * Length = Size of the information structure - * FsInformationClass = Index to a information structure - * - * FileFsVolumeInformation FILE_FS_VOLUME_INFORMATION - * FileFsLabelInformation FILE_FS_LABEL_INFORMATION - * FileFsSizeInformation FILE_FS_SIZE_INFORMATION - * FileFsDeviceInformation FILE_FS_DEVICE_INFORMATION - * FileFsAttributeInformation FILE_FS_ATTRIBUTE_INFORMATION - * FileFsControlInformation - * FileFsQuotaQueryInformation -- - * FileFsQuotaSetInformation -- - * FileFsMaximumInformation - * - * RETURNS: Status - * * @implemented */ - -NTSTATUS STDCALL +NTSTATUS +NTAPI NtQueryVolumeInformationFile(IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID FsInformation, - IN ULONG Length, - IN FS_INFORMATION_CLASS FsInformationClass) + OUT PIO_STATUS_BLOCK IoStatusBlock, + OUT PVOID FsInformation, + IN ULONG Length, + IN FS_INFORMATION_CLASS FsInformationClass) { - PFILE_OBJECT FileObject; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status = STATUS_SUCCESS; - PIO_STACK_LOCATION StackPtr; - PVOID SystemBuffer; - KPROCESSOR_MODE PreviousMode; - - DPRINT("FsInformation %p\n", FsInformation); - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION StackPtr; + PVOID SystemBuffer; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { _SEH_TRY { - if (IoStatusBlock != NULL) + if (IoStatusBlock) { ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); } - if (Length != 0) - { - ProbeForWrite(FsInformation, - Length, - 1); - } + if (Length) ProbeForWrite(FsInformation, Length, 1); } _SEH_HANDLE { @@ -2573,256 +2521,215 @@ { return Status; } - } - else - { - ASSERT(IoStatusBlock != NULL); - ASSERT(FsInformation != NULL); - } - - Status = ObReferenceObjectByHandle(FileHandle, - 0, /* FIXME - depends on the information class! */ - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); + } + + Status = ObReferenceObjectByHandle(FileHandle, + 0, /* FIXME - depends on the information class! */ + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if (!Irp) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_SYSB); + if (!SystemBuffer) + { + IoFreeIrp(Irp); + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + + Irp->RequestorMode = PreviousMode; + Irp->AssociatedIrp.SystemBuffer = SystemBuffer; + KeResetEvent( &FileObject->Event ); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.QueryVolume.Length = Length; + StackPtr->Parameters.QueryVolume.FsInformationClass = + FsInformationClass; + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + UserRequest, + PreviousMode, + FALSE, + NULL); + Status = IoStatusBlock->Status; } - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (SystemBuffer == NULL) - { - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - - Irp->RequestorMode = PreviousMode; - Irp->AssociatedIrp.SystemBuffer = SystemBuffer; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.QueryVolume.Length = Length; - StackPtr->Parameters.QueryVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject, - Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - PreviousMode, - FALSE, - NULL); - Status = IoStatusBlock->Status; - } - DPRINT("Status %x\n", Status); - - if (NT_SUCCESS(Status)) - { + if (NT_SUCCESS(Status)) + { _SEH_TRY { - DPRINT("Information %lu\n", IoStatusBlock->Information); RtlCopyMemory(FsInformation, SystemBuffer, IoStatusBlock->Information); - } - _SEH_HANDLE - { + } + _SEH_HANDLE + { Status = _SEH_GetExceptionCode(); - } + } _SEH_END; } - ExFreePool(SystemBuffer); - - return(Status); + ExFreePool(SystemBuffer); + return Status; } /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI NtSetVolumeInformationFile(IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID FsInformation, - IN ULONG Length, - IN FS_INFORMATION_CLASS FsInformationClass) + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID FsInformation, + IN ULONG Length, + IN FS_INFORMATION_CLASS FsInformationClass) { - PFILE_OBJECT FileObject; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status; - PIO_STACK_LOCATION StackPtr; - PVOID SystemBuffer; - KPROCESSOR_MODE PreviousMode; - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - Status = STATUS_SUCCESS; - _SEH_TRY - { - if (IoStatusBlock != NULL) - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - } - - if (Length != 0) - { - ProbeForRead(FsInformation, - Length, - 1); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - ASSERT(IoStatusBlock != NULL); - ASSERT(FsInformation != NULL); - } - - Status = ObReferenceObjectByHandle(FileHandle, - FILE_WRITE_ATTRIBUTES, - NULL, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (Status != STATUS_SUCCESS) - { - return(Status); - } - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize,TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (SystemBuffer == NULL) - { + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION StackPtr; + PVOID SystemBuffer; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + if (IoStatusBlock) + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + + if (Length) ProbeForRead(FsInformation, Length, 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + + Status = ObReferenceObjectByHandle(FileHandle, + FILE_WRITE_ATTRIBUTES, + NULL, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (Status != STATUS_SUCCESS) return Status; + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize,TRUE); + if (!Irp) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_SYSB); + if (!SystemBuffer) + { Status = STATUS_INSUFFICIENT_RESOURCES; goto failfreeirp; - } - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - /* no need to probe again */ - RtlCopyMemory(SystemBuffer, - FsInformation, - Length); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(SystemBuffer, - TAG_SYSB); + } + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + /* no need to probe again */ + RtlCopyMemory(SystemBuffer, FsInformation, Length); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(SystemBuffer, TAG_SYSB); failfreeirp: - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return Status; - } - } - else - { - RtlCopyMemory(SystemBuffer, - FsInformation, - Length); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->AssociatedIrp.SystemBuffer = SystemBuffer; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.SetVolume.Length = Length; - StackPtr->Parameters.SetVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - PreviousMode, - FALSE, - NULL); + IoFreeIrp(Irp); + ObDereferenceObject(FileObject); + return Status; + } + } + else + { + RtlCopyMemory(SystemBuffer, FsInformation, Length); + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = PreviousMode; + Irp->AssociatedIrp.SystemBuffer = SystemBuffer; + KeResetEvent( &FileObject->Event ); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.SetVolume.Length = Length; + StackPtr->Parameters.SetVolume.FsInformationClass = + FsInformationClass; + + Status = IoCallDriver(DeviceObject,Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + UserRequest, + PreviousMode, + FALSE, + NULL); _SEH_TRY { - Status = IoStatusBlock->Status; + Status = IoStatusBlock->Status; } _SEH_HANDLE { Status = _SEH_GetExceptionCode(); } _SEH_END; - } - - ExFreePool(SystemBuffer); - - return(Status); + } + + ExFreePool(SystemBuffer); + return Status; }

18 years, 5 months

[ion] 22767: - Move IoGetBaseFileSystemDeviceObject to device.c and make it check for FO_DIRECT_DEVICE_OPEN, which it wasn't before (and also code it in a less confusing way like the other IoGetXxxDeviceObject APIs) - Mask out the DO_VERIFY_VOLUME flag when mounting a device.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 10:28:29 2006 New Revision: 22767 URL: http://svn.reactos.org/svn/reactos?rev=22767&view=rev Log: - Move IoGetBaseFileSystemDeviceObject to device.c and make it check for FO_DIRECT_DEVICE_OPEN, which it wasn't before (and also code it in a less confusing way like the other IoGetXxxDeviceObject APIs) - Mask out the DO_VERIFY_VOLUME flag when mounting a device. Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Sun Jul 2 10:28:29 2006 @@ -1164,6 +1164,41 @@ } /* Return the DO we found */ + return DeviceObject; +} + +/* + * @implemented + */ +PDEVICE_OBJECT +NTAPI +IoGetBaseFileSystemDeviceObject(IN PFILE_OBJECT FileObject) +{ + PDEVICE_OBJECT DeviceObject; + + /* + * If the FILE_OBJECT's VPB is defined, + * get the device from it. + */ + if ((FileObject->Vpb) && (FileObject->Vpb->DeviceObject)) + { + /* Use the VPB's Device Object's */ + DeviceObject = FileObject->Vpb->DeviceObject; + } + else if (!(FileObject->Flags & FO_DIRECT_DEVICE_OPEN) && + (FileObject->DeviceObject->Vpb) && + (FileObject->DeviceObject->Vpb->DeviceObject)) + { + /* Use the VPB's File System Object */ + DeviceObject = FileObject->DeviceObject->Vpb->DeviceObject; + } + else + { + /* Use the FO's Device Object */ + DeviceObject = FileObject->DeviceObject; + } + + /* Return the device object we found */ return DeviceObject; } Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c Sun Jul 2 10:28:29 2006 @@ -35,7 +35,8 @@ NTAPI IoInitVpbImplementation(VOID) { - KeInitializeSpinLock(&IoVpbLock); + /* Just initialize the VPB Lock */ + KeInitializeSpinLock(&IoVpbLock); } VOID @@ -348,7 +349,8 @@ /* Initialize the event to wait on */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - /* Get the actual device to mount */ + /* Remove the verify flag and get the actual device to mount */ + DeviceObject->Flags &= ~DO_VERIFY_VOLUME; while (AttachedDeviceObject->AttachedDevice) { /* Get the next one */ @@ -782,48 +784,6 @@ /* * @implemented */ -PDEVICE_OBJECT -NTAPI -IoGetBaseFileSystemDeviceObject(IN PFILE_OBJECT FileObject) -{ - PDEVICE_OBJECT DeviceObject = NULL; - PVPB Vpb = NULL; - - /* - * If the FILE_OBJECT's VPB is defined, - * get the device from it. - */ - if (NULL != (Vpb = FileObject->Vpb)) - { - if (NULL != (DeviceObject = Vpb->DeviceObject)) - { - /* Vpb->DeviceObject DEFINED! */ - return DeviceObject; - } - } - - /* - * If that failed, try the VPB - * in the FILE_OBJECT's DeviceObject. - */ - DeviceObject = FileObject->DeviceObject; - if (NULL == (Vpb = DeviceObject->Vpb)) - { - /* DeviceObject->Vpb UNDEFINED! */ - return DeviceObject; - } - - /* - * If that pointer to the VPB is again - * undefined, return directly the - * device object from the FILE_OBJECT. - */ - return ((NULL == Vpb->DeviceObject) ? DeviceObject : Vpb->DeviceObject); -} - -/* - * @implemented - */ NTSTATUS NTAPI IoRegisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject,

18 years, 5 months

[ion] 22766: - Small optimization: don't bother to get the File System Listhead we'll parse if we're going to fail because of wrong VPB flags later... get the list only after we're sure we need it.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 10:18:55 2006 New Revision: 22766 URL: http://svn.reactos.org/svn/reactos?rev=22766&view=rev Log: - Small optimization: don't bother to get the File System Listhead we'll parse if we're going to fail because of wrong VPB flags later... get the list only after we're sure we need it. Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c Sun Jul 2 10:18:55 2006 @@ -316,10 +316,9 @@ PIRP Irp; PIO_STACK_LOCATION StackPtr; PLIST_ENTRY FsList, ListEntry; - PDEVICE_OBJECT ParentFsDeviceObject; + LIST_ENTRY LocalList; PDEVICE_OBJECT AttachedDeviceObject = DeviceObject; - PDEVICE_OBJECT FileSystemDeviceObject; - LIST_ENTRY LocalList; + PDEVICE_OBJECT FileSystemDeviceObject, ParentFsDeviceObject; ULONG FsStackOverhead; PAGED_CODE(); @@ -343,24 +342,6 @@ KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&FileSystemListLock, TRUE); - /* For a mount operation, this can only be a Disk, CD-ROM or tape */ - if ((DeviceObject->DeviceType == FILE_DEVICE_DISK) || - (DeviceObject->DeviceType == FILE_DEVICE_VIRTUAL_DISK)) - { - /* Use the disk list */ - FsList = &IopDiskFsListHead; - } - else if (DeviceObject->DeviceType == FILE_DEVICE_CD_ROM) - { - /* Use the CD-ROM list */ - FsList = &IopCdRomFsListHead; - } - else - { - /* It's gotta be a tape... */ - FsList = &IopTapeFsListHead; - } - /* Make sure we weren't already mounted */ if (!(DeviceObject->Vpb->Flags & (VPB_MOUNTED | VPB_REMOVE_PENDING))) { @@ -376,6 +357,24 @@ /* Reference it */ ObReferenceObject(AttachedDeviceObject); + + /* For a mount operation, this can only be a Disk, CD-ROM or tape */ + if ((DeviceObject->DeviceType == FILE_DEVICE_DISK) || + (DeviceObject->DeviceType == FILE_DEVICE_VIRTUAL_DISK)) + { + /* Use the disk list */ + FsList = &IopDiskFsListHead; + } + else if (DeviceObject->DeviceType == FILE_DEVICE_CD_ROM) + { + /* Use the CD-ROM list */ + FsList = &IopCdRomFsListHead; + } + else + { + /* It's gotta be a tape... */ + FsList = &IopTapeFsListHead; + } /* Now loop the fs list until one of the file systems accepts us */ Status = STATUS_UNSUCCESSFUL;

18 years, 5 months

← Newer
1
...
60
61
62
63
64
65
66
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006