Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[ion] 22765: - Use IoIsErrorUserInoduced to check if we couldn't mount the device because it was not actually inserted, was unrocognized, write-protected, etc... and completely break out of the mounting procedure if so. - Also use FsRtlIsTotalDeviceFailure to check if the error was a fatal device error (like a CRC error) and abandon mounting in this case as well.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 10:15:52 2006 New Revision: 22765 URL: http://svn.reactos.org/svn/reactos?rev=22765&view=rev Log: - Use IoIsErrorUserInoduced to check if we couldn't mount the device because it was not actually inserted, was unrocognized, write-protected, etc... and completely break out of the mounting procedure if so. - Also use FsRtlIsTotalDeviceFailure to check if the error was a fatal device error (like a CRC error) and abandon mounting in this case as well. 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:15:52 2006 @@ -479,6 +479,15 @@ } else { + /* Check if we failed because of the user */ + if ((IoIsErrorUserInduced(Status)) && + (IoStatusBlock.Information == 1)) + { + /* Break out and fail */ + break; + } + + /* Otherwise, check if we need to load the FS driver */ if (Status == STATUS_FS_DRIVER_REQUIRED) { /* We need to release the lock */ @@ -497,7 +506,6 @@ if (!DeviceIsLocked) { /* Lock it ourselves */ - DPRINT1("Waiting\n"); Status = KeWaitForSingleObject(&DeviceObject-> DeviceLock, Executive, @@ -531,6 +539,19 @@ LocalList.Flink = FsList->Flink; ListEntry = &LocalList; } + + /* + * Check if we failed with any other error then an unrecognized + * volume, and if this request doesn't allow mounting the raw + * file system. + */ + if (!(AllowRawMount) && + (Status != STATUS_UNRECOGNIZED_VOLUME) && + (FsRtlIsTotalDeviceFailure(Status))) + { + /* Break out and give up */ + break; + } } /* Go to the next FS entry */

18 years, 5 months

[ion] 22764: - Implement IopInitailizeVpbForMount for the purpose of setting up the VPB for a newly mounted DO. It properly references the VPB and sets up its stack size and flags, adding support for VPB_RAW_MOUNT. Also sets the VPB pointer in the DevObjExtension. - Fix a bug which was causing us to incorrectly unlock the device if it was already locked by the caller isntead of by IopMountVolume. - When loading the file system, make sure to unlock the device object if we had locked it in IopMoun

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 10:11:19 2006 New Revision: 22764 URL: http://svn.reactos.org/svn/reactos?rev=22764&view=rev Log: - Implement IopInitailizeVpbForMount for the purpose of setting up the VPB for a newly mounted DO. It properly references the VPB and sets up its stack size and flags, adding support for VPB_RAW_MOUNT. Also sets the VPB pointer in the DevObjExtension. - Fix a bug which was causing us to incorrectly unlock the device if it was already locked by the caller isntead of by IopMountVolume. - When loading the file system, make sure to unlock the device object if we had locked it in IopMountVolume, as well as to re-lock it afterwards. Also handle a potential race condition due to this unloacking, in which the VPB might've become mounted behind our back, and simply return success if this happened. 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:11:19 2006 @@ -130,6 +130,39 @@ /* Release the VPB lock and return status */ IoReleaseVpbSpinLock(OldIrql); return Result; +} + +PVPB +NTAPI +IopInitializeVpbForMount(IN PDEVICE_OBJECT DeviceObject, + IN PDEVICE_OBJECT AttachedDeviceObject, + IN BOOLEAN Raw) +{ + KIRQL OldIrql; + PVPB Vpb; + + /* Lock the VPBs */ + IoAcquireVpbSpinLock(&OldIrql); + Vpb = DeviceObject->Vpb; + + /* Set the VPB as mounted and possibly raw */ + Vpb->Flags |= VPB_MOUNTED | Raw ? VPB_RAW_MOUNT : 0; + + /* Set the stack size */ + Vpb->DeviceObject->StackSize = AttachedDeviceObject->StackSize; + + /* Add one for the FS Driver */ + Vpb->DeviceObject->StackSize++; + + /* Set the VPB in the device extension */ + IoGetDevObjExtension(Vpb->DeviceObject)->Vpb = Vpb; + + /* Reference it */ + Vpb->ReferenceCount++; + + /* Release the VPB lock and return it */ + IoReleaseVpbSpinLock(OldIrql); + return Vpb; } VOID @@ -283,7 +316,7 @@ PIRP Irp; PIO_STACK_LOCATION StackPtr; PLIST_ENTRY FsList, ListEntry; - PDEVICE_OBJECT DevObject; + PDEVICE_OBJECT ParentFsDeviceObject; PDEVICE_OBJECT AttachedDeviceObject = DeviceObject; PDEVICE_OBJECT FileSystemDeviceObject; LIST_ENTRY LocalList; @@ -376,6 +409,7 @@ FileSystemDeviceObject = CONTAINING_RECORD(ListEntry, DEVICE_OBJECT, Queue.ListEntry); + ParentFsDeviceObject = FileSystemDeviceObject; /* * If this file system device is attached to some other device, @@ -434,26 +468,69 @@ Status = IoStatusBlock.Status; } - switch (Status) + /* Check if mounting was successful */ + if (NT_SUCCESS(Status)) { - case STATUS_FS_DRIVER_REQUIRED: - DevObject = FileSystemDeviceObject; + /* Mount the VPB */ + *Vpb = IopInitializeVpbForMount(DeviceObject, + AttachedDeviceObject, + (DeviceObject->Vpb->Flags & + VPB_RAW_MOUNT)); + } + else + { + if (Status == STATUS_FS_DRIVER_REQUIRED) + { + /* We need to release the lock */ ExReleaseResourceLite(&FileSystemListLock); - IopLoadFileSystem(DevObject); - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); + + /* Release the device lock if we're holding it */ + if (!DeviceIsLocked) + { + KeSetEvent(&DeviceObject->DeviceLock, 0, FALSE); + } + + /* Load the FS */ + IopLoadFileSystem(ParentFsDeviceObject); + + /* Check if the device isn't already locked */ + if (!DeviceIsLocked) + { + /* Lock it ourselves */ + DPRINT1("Waiting\n"); + Status = KeWaitForSingleObject(&DeviceObject-> + DeviceLock, + Executive, + KeGetPreviousMode(), + Alertable, + NULL); + if ((Status == STATUS_ALERTED) || + (Status == STATUS_USER_APC)) + { + /* Don't mount if we were interrupted */ + ObDereferenceObject(AttachedDeviceObject); + return Status; + } + } + + /* Reacquire the lock */ + ExAcquireResourceSharedLite(&FileSystemListLock, TRUE); + + /* When we released the lock, make sure nobody beat us */ + if (DeviceObject->Vpb->Flags & VPB_MOUNTED) + { + /* Someone did, break out */ + Status = STATUS_SUCCESS; + break; + } + + /* Start over by setting a failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; + /* We need to setup a local list to pickup where we left */ LocalList.Flink = FsList->Flink; ListEntry = &LocalList; - break; - - case STATUS_SUCCESS: - DeviceObject->Vpb->Flags = DeviceObject->Vpb->Flags | - VPB_MOUNTED; - - case STATUS_UNRECOGNIZED_VOLUME: - default: - /* do nothing */ - break; + } } /* Go to the next FS entry */ @@ -479,7 +556,7 @@ KeLeaveCriticalRegion(); /* Release the device lock if we're holding it */ - if (DeviceIsLocked) KeSetEvent(&DeviceObject->DeviceLock, 0, FALSE); + if (!DeviceIsLocked) KeSetEvent(&DeviceObject->DeviceLock, 0, FALSE); /* Check if we failed to mount the boot partition */ if ((!NT_SUCCESS(Status)) &&

18 years, 5 months

[ion] 22763: - Improve list looping to remove gotos. - Dereference the device object in case of failure. - Add some optimizations to quickly skip invalid raw mounting. - Add support for VPB_RAW_MOUNT. - Allow raw mount if this is the only device on the list. - Make the success case go through shared exit, otherwise the device wasn't getting unlocked previously.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 09:52:47 2006 New Revision: 22763 URL: http://svn.reactos.org/svn/reactos?rev=22763&view=rev Log: - Improve list looping to remove gotos. - Dereference the device object in case of failure. - Add some optimizations to quickly skip invalid raw mounting. - Add support for VPB_RAW_MOUNT. - Allow raw mount if this is the only device on the list. - Make the success case go through shared exit, otherwise the device wasn't getting unlocked previously. 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 09:52:47 2006 @@ -347,8 +347,31 @@ /* Now loop the fs list until one of the file systems accepts us */ Status = STATUS_UNSUCCESSFUL; ListEntry = FsList->Flink; - while (ListEntry != FsList) - { + while ((ListEntry != FsList) && !(NT_SUCCESS(Status))) + { + /* + * If we're not allowed to mount this volume and this is our last + * (but not only) chance to mount it... + */ + if (!(AllowRawMount) && + (ListEntry->Flink == FsList) && + (ListEntry != FsList->Flink)) + { + /* Then fail this mount request */ + break; + } + + /* + * Also check if this is a raw mount and there are other file + * systems on the list. + */ + if ((DeviceObject->Vpb->Flags & VPB_RAW_MOUNT) && + (ListEntry->Flink != FsList)) + { + /* Then skip this entry */ + continue; + } + /* Get the Device Object for this FS */ FileSystemDeviceObject = CONTAINING_RECORD(ListEntry, DEVICE_OBJECT, @@ -368,56 +391,47 @@ FsStackOverhead++; } - /* If we are not allowed to mount this volume as a raw filesystem volume - then don't try this */ - if (!AllowRawMount && RawFsIsRawFileSystemDeviceObject(FileSystemDeviceObject)) + /* Clear the event */ + KeClearEvent(&Event); + + /* Allocate the IRP */ + Irp = IoAllocateIrp(AttachedDeviceObject->StackSize + + FsStackOverhead, + TRUE); + if (!Irp) { - Status = STATUS_UNRECOGNIZED_VOLUME; + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + break; } - else + + /* Setup the IRP */ + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = &Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Flags = IRP_MOUNT_COMPLETION | IRP_SYNCHRONOUS_PAGING_IO; + Irp->RequestorMode = KernelMode; + + /* Get the I/O Stack location and set it up */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; + StackPtr->MinorFunction = IRP_MN_MOUNT_VOLUME; + StackPtr->Flags = AllowRawMount; + StackPtr->Parameters.MountVolume.Vpb = DeviceObject->Vpb; + StackPtr->Parameters.MountVolume.DeviceObject = + AttachedDeviceObject; + + /* Call the driver */ + Status = IoCallDriver(FileSystemDeviceObject, Irp); + if (Status == STATUS_PENDING) { - /* Clear the event */ - KeClearEvent(&Event); - - /* Allocate the IRP */ - Irp = IoAllocateIrp(AttachedDeviceObject->StackSize + - FsStackOverhead, - TRUE); - if (!Irp) - { - /* Fail */ - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - /* Setup the IRP */ - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->Flags = IRP_MOUNT_COMPLETION | IRP_SYNCHRONOUS_PAGING_IO; - Irp->RequestorMode = KernelMode; - - /* Get the I/O Stack location and set it up */ - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_MOUNT_VOLUME; - StackPtr->Flags = AllowRawMount; - StackPtr->Parameters.MountVolume.Vpb = DeviceObject->Vpb; - StackPtr->Parameters.MountVolume.DeviceObject = - AttachedDeviceObject; - - /* Call the driver */ - Status = IoCallDriver(FileSystemDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait on it */ - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock.Status; - } + /* Wait on it */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; } switch (Status) @@ -435,9 +449,6 @@ case STATUS_SUCCESS: DeviceObject->Vpb->Flags = DeviceObject->Vpb->Flags | VPB_MOUNTED; - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - return(STATUS_SUCCESS); case STATUS_UNRECOGNIZED_VOLUME: default: @@ -445,8 +456,12 @@ break; } + /* Go to the next FS entry */ ListEntry = ListEntry->Flink; } + + /* Dereference the device if we failed */ + if (!NT_SUCCESS(Status)) ObDereferenceObject(AttachedDeviceObject); } else if (DeviceObject->Vpb->Flags & VPB_REMOVE_PENDING) {

18 years, 5 months

[ion] 22762: - If the device to be mounted is an attachee, find the base device object - Reference the device object being mounted. - If the file system being mounted is an atachee, find its base device object too, and increase the IRP Stack for each attached FSD. - Fix IRP parameters with this new information.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 09:44:27 2006 New Revision: 22762 URL: http://svn.reactos.org/svn/reactos?rev=22762&view=rev Log: - If the device to be mounted is an attachee, find the base device object - Reference the device object being mounted. - If the file system being mounted is an atachee, find its base device object too, and increase the IRP Stack for each attached FSD. - Fix IRP parameters with this new information. 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 09:44:27 2006 @@ -284,8 +284,10 @@ PIO_STACK_LOCATION StackPtr; PLIST_ENTRY FsList, ListEntry; PDEVICE_OBJECT DevObject; + PDEVICE_OBJECT AttachedDeviceObject = DeviceObject; PDEVICE_OBJECT FileSystemDeviceObject; LIST_ENTRY LocalList; + ULONG FsStackOverhead; PAGED_CODE(); /* Check if the device isn't already locked */ @@ -332,6 +334,16 @@ /* Initialize the event to wait on */ KeInitializeEvent(&Event, NotificationEvent, FALSE); + /* Get the actual device to mount */ + while (AttachedDeviceObject->AttachedDevice) + { + /* Get the next one */ + AttachedDeviceObject = AttachedDeviceObject->AttachedDevice; + } + + /* Reference it */ + ObReferenceObject(AttachedDeviceObject); + /* Now loop the fs list until one of the file systems accepts us */ Status = STATUS_UNSUCCESSFUL; ListEntry = FsList->Flink; @@ -341,6 +353,20 @@ FileSystemDeviceObject = CONTAINING_RECORD(ListEntry, DEVICE_OBJECT, Queue.ListEntry); + + /* + * If this file system device is attached to some other device, + * then we must make sure to increase the stack size for the IRP. + * The default is +1, for the FS device itself. + */ + FsStackOverhead = 1; + while (FileSystemDeviceObject->AttachedDevice) + { + /* Get the next attached device and increase overhead */ + FileSystemDeviceObject = FileSystemDeviceObject-> + AttachedDevice; + FsStackOverhead++; + } /* If we are not allowed to mount this volume as a raw filesystem volume then don't try this */ @@ -354,8 +380,8 @@ KeClearEvent(&Event); /* Allocate the IRP */ - Irp = IoAllocateIrp(FileSystemDeviceObject->StackSize + - 1, + Irp = IoAllocateIrp(AttachedDeviceObject->StackSize + + FsStackOverhead, TRUE); if (!Irp) { @@ -378,7 +404,7 @@ StackPtr->Flags = AllowRawMount; StackPtr->Parameters.MountVolume.Vpb = DeviceObject->Vpb; StackPtr->Parameters.MountVolume.DeviceObject = - DeviceObject; + AttachedDeviceObject; /* Call the driver */ Status = IoCallDriver(FileSystemDeviceObject, Irp);

18 years, 5 months

[ion] 22761: - Mount the FS inline to avoid sending 6 parameters to a function only called once. - Set the right IRP flags for a mount operation. - Don't ignore AllowRawMount flag. - Don't waste time passing or clearing unused flags/data on the IRP/Io Stack.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 09:37:55 2006 New Revision: 22761 URL: http://svn.reactos.org/svn/reactos?rev=22761&view=rev Log: - Mount the FS inline to avoid sending 6 parameters to a function only called once. - Set the right IRP flags for a mount operation. - Don't ignore AllowRawMount flag. - Don't waste time passing or clearing unused flags/data on the IRP/Io Stack. 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 09:37:55 2006 @@ -220,52 +220,6 @@ /* Release the lock */ ExReleaseResourceLite(&FileSystemListLock); KeLeaveCriticalRegion(); -} - -NTSTATUS -NTAPI -IopMountFileSystem(IN PDEVICE_OBJECT DeviceObject, - IN PDEVICE_OBJECT DeviceToMount) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - ASSERT_IRQL(PASSIVE_LEVEL); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - DPRINT("Irp->UserIosb 0x%p\n", Irp->UserIosb); - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_MOUNT_VOLUME; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - StackPtr->Parameters.MountVolume.Vpb = DeviceToMount->Vpb; - StackPtr->Parameters.MountVolume.DeviceObject = DeviceToMount; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - return(Status); } VOID @@ -323,12 +277,16 @@ IN BOOLEAN Alertable, OUT PVPB *Vpb) { + KEVENT Event; NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + PIRP Irp; + PIO_STACK_LOCATION StackPtr; PLIST_ENTRY FsList, ListEntry; PDEVICE_OBJECT DevObject; PDEVICE_OBJECT FileSystemDeviceObject; LIST_ENTRY LocalList; - ASSERT_IRQL(PASSIVE_LEVEL); + PAGED_CODE(); /* Check if the device isn't already locked */ if (!DeviceIsLocked) @@ -371,6 +329,9 @@ /* Make sure we weren't already mounted */ if (!(DeviceObject->Vpb->Flags & (VPB_MOUNTED | VPB_REMOVE_PENDING))) { + /* Initialize the event to wait on */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + /* Now loop the fs list until one of the file systems accepts us */ Status = STATUS_UNSUCCESSFUL; ListEntry = FsList->Flink; @@ -389,7 +350,48 @@ } else { - Status = IopMountFileSystem(FileSystemDeviceObject, DeviceObject); + /* Clear the event */ + KeClearEvent(&Event); + + /* Allocate the IRP */ + Irp = IoAllocateIrp(FileSystemDeviceObject->StackSize + + 1, + TRUE); + if (!Irp) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + /* Setup the IRP */ + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = &Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Flags = IRP_MOUNT_COMPLETION | IRP_SYNCHRONOUS_PAGING_IO; + Irp->RequestorMode = KernelMode; + + /* Get the I/O Stack location and set it up */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; + StackPtr->MinorFunction = IRP_MN_MOUNT_VOLUME; + StackPtr->Flags = AllowRawMount; + StackPtr->Parameters.MountVolume.Vpb = DeviceObject->Vpb; + StackPtr->Parameters.MountVolume.DeviceObject = + DeviceObject; + + /* Call the driver */ + Status = IoCallDriver(FileSystemDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on it */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } } switch (Status)

18 years, 5 months

[ion] 22760: - Respect DeviceIsLocked flag and Alertable in IopMountVolume - Don't mount if the VPB is alread ymoutned or being removed - Bugcheck the system if we failed to mount the boot partition.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 09:30:45 2006 New Revision: 22760 URL: http://svn.reactos.org/svn/reactos?rev=22760&view=rev Log: - Respect DeviceIsLocked flag and Alertable in IopMountVolume - Don't mount if the VPB is alread ymoutned or being removed - Bugcheck the system if we failed to mount the boot partition. 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 09:30:45 2006 @@ -330,8 +330,25 @@ LIST_ENTRY LocalList; ASSERT_IRQL(PASSIVE_LEVEL); + /* Check if the device isn't already locked */ + if (!DeviceIsLocked) + { + /* Lock it ourselves */ + Status = KeWaitForSingleObject(&DeviceObject->DeviceLock, + Executive, + KeGetPreviousMode(), + Alertable, + NULL); + if ((Status == STATUS_ALERTED) || (Status == STATUS_USER_APC)) + { + /* Don't mount if we were interrupted */ + return Status; + } + } + + /* Acquire the FS Lock*/ KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); + ExAcquireResourceSharedLite(&FileSystemListLock, TRUE); /* For a mount operation, this can only be a Disk, CD-ROM or tape */ if ((DeviceObject->DeviceType == FILE_DEVICE_DISK) || @@ -351,57 +368,90 @@ FsList = &IopTapeFsListHead; } - /* Now loop the fs list until one of the file systems accepts us */ - ListEntry = FsList->Flink; - while (ListEntry != FsList) - { - /* Get the Device Object for this FS */ - FileSystemDeviceObject = CONTAINING_RECORD(ListEntry, - DEVICE_OBJECT, - Queue.ListEntry); - - /* If we are not allowed to mount this volume as a raw filesystem volume - then don't try this */ - if (!AllowRawMount && RawFsIsRawFileSystemDeviceObject(FileSystemDeviceObject)) - { - Status = STATUS_UNRECOGNIZED_VOLUME; - } - else - { - Status = IopMountFileSystem(FileSystemDeviceObject, DeviceObject); - } - - switch (Status) - { - case STATUS_FS_DRIVER_REQUIRED: - DevObject = FileSystemDeviceObject; - ExReleaseResourceLite(&FileSystemListLock); - IopLoadFileSystem(DevObject); - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - /* We need to setup a local list to pickup where we left */ - LocalList.Flink = FsList->Flink; - ListEntry = &LocalList; - break; - - case STATUS_SUCCESS: - DeviceObject->Vpb->Flags = DeviceObject->Vpb->Flags | - VPB_MOUNTED; - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - return(STATUS_SUCCESS); - - case STATUS_UNRECOGNIZED_VOLUME: - default: - /* do nothing */ - break; - } - - ListEntry = ListEntry->Flink; - } - + /* Make sure we weren't already mounted */ + if (!(DeviceObject->Vpb->Flags & (VPB_MOUNTED | VPB_REMOVE_PENDING))) + { + /* Now loop the fs list until one of the file systems accepts us */ + Status = STATUS_UNSUCCESSFUL; + ListEntry = FsList->Flink; + while (ListEntry != FsList) + { + /* Get the Device Object for this FS */ + FileSystemDeviceObject = CONTAINING_RECORD(ListEntry, + DEVICE_OBJECT, + Queue.ListEntry); + + /* If we are not allowed to mount this volume as a raw filesystem volume + then don't try this */ + if (!AllowRawMount && RawFsIsRawFileSystemDeviceObject(FileSystemDeviceObject)) + { + Status = STATUS_UNRECOGNIZED_VOLUME; + } + else + { + Status = IopMountFileSystem(FileSystemDeviceObject, DeviceObject); + } + + switch (Status) + { + case STATUS_FS_DRIVER_REQUIRED: + DevObject = FileSystemDeviceObject; + ExReleaseResourceLite(&FileSystemListLock); + IopLoadFileSystem(DevObject); + ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); + /* We need to setup a local list to pickup where we left */ + LocalList.Flink = FsList->Flink; + ListEntry = &LocalList; + break; + + case STATUS_SUCCESS: + DeviceObject->Vpb->Flags = DeviceObject->Vpb->Flags | + VPB_MOUNTED; + ExReleaseResourceLite(&FileSystemListLock); + KeLeaveCriticalRegion(); + return(STATUS_SUCCESS); + + case STATUS_UNRECOGNIZED_VOLUME: + default: + /* do nothing */ + break; + } + + ListEntry = ListEntry->Flink; + } + } + else if (DeviceObject->Vpb->Flags & VPB_REMOVE_PENDING) + { + /* Someone wants to remove us */ + Status = STATUS_DEVICE_DOES_NOT_EXIST; + } + else + { + /* Someone already mounted us */ + Status = STATUS_SUCCESS; + } + + /* Release the FS lock */ ExReleaseResourceLite(&FileSystemListLock); KeLeaveCriticalRegion(); - return(STATUS_UNRECOGNIZED_VOLUME); + + /* Release the device lock if we're holding it */ + if (DeviceIsLocked) KeSetEvent(&DeviceObject->DeviceLock, 0, FALSE); + + /* Check if we failed to mount the boot partition */ + if ((!NT_SUCCESS(Status)) && + (DeviceObject->Flags & DO_SYSTEM_BOOT_PARTITION)) + { + /* Bugcheck the system */ + KeBugCheckEx(INACCESSIBLE_BOOT_DEVICE, + (ULONG_PTR)DeviceObject, + Status, + 0, + 0); + } + + /* Return the mount status */ + return Status; } /* PUBLIC FUNCTIONS **********************************************************/

18 years, 5 months

[ion] 22759: - Fix the hack in the previous commit which broke FS support.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 08:33:45 2006 New Revision: 22759 URL: http://svn.reactos.org/svn/reactos?rev=22759&view=rev Log: - Fix the hack in the previous commit which broke FS support. 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 08:33:45 2006 @@ -327,12 +327,12 @@ PLIST_ENTRY FsList, ListEntry; PDEVICE_OBJECT DevObject; PDEVICE_OBJECT FileSystemDeviceObject; + LIST_ENTRY LocalList; ASSERT_IRQL(PASSIVE_LEVEL); KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - restart: /* 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)) @@ -378,7 +378,10 @@ ExReleaseResourceLite(&FileSystemListLock); IopLoadFileSystem(DevObject); ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - goto restart; + /* We need to setup a local list to pickup where we left */ + LocalList.Flink = FsList->Flink; + ListEntry = &LocalList; + break; case STATUS_SUCCESS: DeviceObject->Vpb->Flags = DeviceObject->Vpb->Flags | @@ -392,6 +395,8 @@ /* do nothing */ break; } + + ListEntry = ListEntry->Flink; } ExReleaseResourceLite(&FileSystemListLock);

18 years, 5 months

[ion] 22758: - Simplify/modularize FS registration by using distinct lists for each type of FS (Tape/Disk/Network/Cdrom). - Optimize by using directly the device queue instead of allocating a structure for each FS registered. - Hack IopMountVolume to manage this new model. Improved version coming in next patch to deal with some bugs.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 06:04:04 2006 New Revision: 22758 URL: http://svn.reactos.org/svn/reactos?rev=22758&view=rev Log: - Simplify/modularize FS registration by using distinct lists for each type of FS (Tape/Disk/Network/Cdrom). - Optimize by using directly the device queue instead of allocating a structure for each FS registered. - Hack IopMountVolume to manage this new model. Improved version coming in next patch to deal with some bugs. 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 06:04:04 2006 @@ -16,24 +16,14 @@ #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IoInitFileSystemImplementation) -#endif - -/* TYPES *******************************************************************/ - -typedef struct _FILE_SYSTEM_OBJECT -{ - PDEVICE_OBJECT DeviceObject; - LIST_ENTRY Entry; -} FILE_SYSTEM_OBJECT, *PFILE_SYSTEM_OBJECT; - -#if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IoInitVpbImplementation) #endif /* GLOBALS ******************************************************************/ ERESOURCE FileSystemListLock; -LIST_ENTRY FileSystemListHead; +LIST_ENTRY IopDiskFsListHead, IopNetworkFsListHead; +LIST_ENTRY IopCdRomFsListHead, IopTapeFsListHead; KGUARDED_MUTEX FsChangeNotifyListLock; LIST_ENTRY FsChangeNotifyListHead; KSPIN_LOCK IoVpbLock; @@ -53,11 +43,14 @@ NTAPI IoInitFileSystemImplementation(VOID) { - InitializeListHead(&FileSystemListHead); - ExInitializeResourceLite(&FileSystemListLock); - - InitializeListHead(&FsChangeNotifyListHead); - KeInitializeGuardedMutex(&FsChangeNotifyListLock); + /* Initialize the FS Lists and Locks */ + InitializeListHead(&IopDiskFsListHead); + InitializeListHead(&IopNetworkFsListHead); + InitializeListHead(&IopCdRomFsListHead); + InitializeListHead(&IopTapeFsListHead); + ExInitializeResourceLite(&FileSystemListLock); + InitializeListHead(&FsChangeNotifyListHead); + KeInitializeGuardedMutex(&FsChangeNotifyListLock); } NTSTATUS @@ -174,38 +167,57 @@ NTAPI IoShutdownRegisteredFileSystems(VOID) { - FILE_SYSTEM_OBJECT* current; + PLIST_ENTRY ListEntry; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK StatusBlock; PIRP Irp; KEVENT Event; - IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; + /* Lock the FS List and initialize an event to wait on */ KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); KeInitializeEvent(&Event, NotificationEvent, FALSE); - LIST_FOR_EACH(current, &FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) - { - /* send IRP_MJ_SHUTDOWN */ + /* Get the first entry and start looping */ + ListEntry = IopDiskFsListHead.Flink; + while (ListEntry != &IopDiskFsListHead) + { + /* Get the device object */ + DeviceObject = CONTAINING_RECORD(ListEntry, + DEVICE_OBJECT, + Queue.ListEntry); + + /* Check if we're attached */ + if (DeviceObject->AttachedDevice) + { + /* Get the attached device */ + DeviceObject = IoGetAttachedDevice(DeviceObject); + } + + /* Build the shutdown IRP and call the driver */ Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SHUTDOWN, - current->DeviceObject, + DeviceObject, NULL, 0, - 0, + NULL, &Event, - &IoStatusBlock); - - Status = IoCallDriver(current->DeviceObject,Irp); + &StatusBlock); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - } - } - + /* Wait on the driver */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + /* Reset the event */ + KeClearEvent(&Event); + + /* Go to the next entry */ + ListEntry = ListEntry->Flink; + } + + /* Release the lock */ ExReleaseResourceLite(&FileSystemListLock); KeLeaveCriticalRegion(); } @@ -311,63 +323,58 @@ IN BOOLEAN Alertable, OUT PVPB *Vpb) { - PFILE_SYSTEM_OBJECT current; NTSTATUS Status; - DEVICE_TYPE MatchingDeviceType; + PLIST_ENTRY FsList, ListEntry; PDEVICE_OBJECT DevObject; + PDEVICE_OBJECT FileSystemDeviceObject; ASSERT_IRQL(PASSIVE_LEVEL); - - switch (DeviceObject->DeviceType) - { - case FILE_DEVICE_DISK: - case FILE_DEVICE_VIRTUAL_DISK: /* ?? */ - MatchingDeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; - break; - - case FILE_DEVICE_CD_ROM: - MatchingDeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; - break; - - case FILE_DEVICE_NETWORK: - MatchingDeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; - break; - - case FILE_DEVICE_TAPE: - MatchingDeviceType = FILE_DEVICE_TAPE_FILE_SYSTEM; - break; - - default: - CPRINT("No matching file system type found for device type: %x\n", - DeviceObject->DeviceType); - return(STATUS_UNRECOGNIZED_VOLUME); - } KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); restart: - LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT, Entry) - { - if (current->DeviceObject->DeviceType != MatchingDeviceType) - { - continue; - } + /* 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 */ + ListEntry = FsList->Flink; + while (ListEntry != FsList) + { + /* Get the Device Object for this FS */ + FileSystemDeviceObject = CONTAINING_RECORD(ListEntry, + DEVICE_OBJECT, + Queue.ListEntry); /* If we are not allowed to mount this volume as a raw filesystem volume then don't try this */ - if (!AllowRawMount && RawFsIsRawFileSystemDeviceObject(current->DeviceObject)) + if (!AllowRawMount && RawFsIsRawFileSystemDeviceObject(FileSystemDeviceObject)) { Status = STATUS_UNRECOGNIZED_VOLUME; } else { - Status = IopMountFileSystem(current->DeviceObject, DeviceObject); + Status = IopMountFileSystem(FileSystemDeviceObject, DeviceObject); } switch (Status) { case STATUS_FS_DRIVER_REQUIRED: - DevObject = current->DeviceObject; + DevObject = FileSystemDeviceObject; ExReleaseResourceLite(&FileSystemListLock); IopLoadFileSystem(DevObject); ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); @@ -497,27 +504,59 @@ NTAPI IoRegisterFileSystem(IN PDEVICE_OBJECT DeviceObject) { - PFILE_SYSTEM_OBJECT Fs; - - Fs = ExAllocatePoolWithTag(NonPagedPool, - sizeof(FILE_SYSTEM_OBJECT), - TAG_FILE_SYSTEM); - ASSERT(Fs!=NULL); - - Fs->DeviceObject = DeviceObject; + PLIST_ENTRY FsList = NULL; + PAGED_CODE(); + + /* Acquire the FS lock */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); - /* The RAW filesystem device objects must be last in the list so the - raw filesystem driver is the last filesystem driver asked to mount - a volume. It is always the first filesystem driver registered so - we use InsertHeadList() here as opposed to the other alternative - InsertTailList(). */ - InsertHeadList(&FileSystemListHead, &Fs->Entry); - + /* Check what kind of FS this is */ + if (DeviceObject->DeviceType == FILE_DEVICE_DISK_FILE_SYSTEM) + { + /* Use the disk list */ + FsList = &IopDiskFsListHead; + } + else if (DeviceObject->DeviceType == FILE_DEVICE_NETWORK_FILE_SYSTEM) + { + /* Use the network device list */ + FsList = &IopNetworkFsListHead; + } + else if (DeviceObject->DeviceType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) + { + /* Use the CD-ROM list */ + FsList = &IopCdRomFsListHead; + } + else if (DeviceObject->DeviceType == FILE_DEVICE_TAPE_FILE_SYSTEM) + { + /* Use the tape list */ + FsList = &IopTapeFsListHead; + } + + /* Make sure that we have a valid list */ + if (FsList) + { + /* Check if we should insert it at the top or bottom of the list */ + if (DeviceObject->Flags & DO_LOW_PRIORITY_FILESYSTEM) + { + /* At the bottom */ + InsertTailList(FsList->Blink, &DeviceObject->Queue.ListEntry); + } + else + { + /* On top */ + InsertHeadList(FsList, &DeviceObject->Queue.ListEntry); + } + } + + /* Clear the initializing flag */ + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* Release the FS Lock */ ExReleaseResourceLite(&FileSystemListLock); KeLeaveCriticalRegion(); + /* Notify file systems of the addition */ IopNotifyFileSystemChange(DeviceObject, TRUE); } @@ -528,24 +567,19 @@ NTAPI IoUnregisterFileSystem(IN PDEVICE_OBJECT DeviceObject) { - PFILE_SYSTEM_OBJECT current; - + PAGED_CODE(); + + /* Acquire the FS lock */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); - LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) - { - if (current->DeviceObject == DeviceObject) - { - RemoveEntryList(&current->Entry); - ExFreePoolWithTag(current, TAG_FILE_SYSTEM); - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - IopNotifyFileSystemChange(DeviceObject, FALSE); - return; - } - } - + /* Simply remove the entry */ + RemoveEntryList(&DeviceObject->Queue.ListEntry); + + /* And notify all registered file systems */ + IopNotifyFileSystemChange(DeviceObject, FALSE); + + /* Then release the lock */ ExReleaseResourceLite(&FileSystemListLock); KeLeaveCriticalRegion(); }

18 years, 5 months

[ion] 22757: - Get rid of the stupid LIST_FOR_EACH macros in FS Notifcation APIs. - Each new change request should be queued at the end of the list, not at the head. - Also, reference the device object for each registration, since one more object is holding a pointer to it, likewise, dereference the object on deregistration. - IopLoadFileSystem should use the base FSD in case the device object is an attachee. Also, use IoBuildDEviceIoControlRequest to minimize the IRP setup to only a couple of l

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 05:44:53 2006 New Revision: 22757 URL: http://svn.reactos.org/svn/reactos?rev=22757&view=rev Log: - Get rid of the stupid LIST_FOR_EACH macros in FS Notifcation APIs. - Each new change request should be queued at the end of the list, not at the head. - Also, reference the device object for each registration, since one more object is holding a pointer to it, likewise, dereference the object on deregistration. - IopLoadFileSystem should use the base FSD in case the device object is an attachee. Also, use IoBuildDEviceIoControlRequest to minimize the IRP setup to only a couple of lines. 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 05:44:53 2006 @@ -145,12 +145,28 @@ IN BOOLEAN DriverActive) { PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; - + PLIST_ENTRY ListEntry; + + /* Acquire the notification lock */ KeAcquireGuardedMutex(&FsChangeNotifyListLock); - LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead,FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) - { - (ChangeEntry->FSDNotificationProc)(DeviceObject, DriverActive); - } + + /* Loop the list */ + ListEntry = FsChangeNotifyListHead.Flink; + while (ListEntry != &FsChangeNotifyListHead) + { + /* Get the entry */ + ChangeEntry = CONTAINING_RECORD(ListEntry, + FS_CHANGE_NOTIFY_ENTRY, + FsChangeNotifyList); + + /* Call the notification procedure */ + ChangeEntry->FSDNotificationProc(DeviceObject, DriverActive); + + /* Go to the next entry */ + ListEntry = ListEntry->Flink; + } + + /* Release the lock */ KeReleaseGuardedMutex(&FsChangeNotifyListLock); } @@ -240,7 +256,7 @@ return(Status); } -NTSTATUS +VOID NTAPI IopLoadFileSystem(IN PDEVICE_OBJECT DeviceObject) { @@ -249,36 +265,42 @@ KEVENT Event; PIRP Irp; NTSTATUS Status; - ASSERT_IRQL(PASSIVE_LEVEL); - + PDEVICE_OBJECT AttachedDeviceObject = DeviceObject; + PAGED_CODE(); + + /* Loop as long as we're attached */ + while (AttachedDeviceObject->AttachedDevice) + { + /* Get the attached device object */ + AttachedDeviceObject = AttachedDeviceObject->AttachedDevice; + } + + /* Initialize the event and build the IRP */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_LOAD_FILE_SYSTEM; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - return(Status); + Irp = IoBuildDeviceIoControlRequest(IRP_MJ_DEVICE_CONTROL, + AttachedDeviceObject, + NULL, + 0, + NULL, + 0, + FALSE, + &Event, + &IoStatusBlock); + if (Irp) + { + /* Set the major and minor functions */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; + StackPtr->MinorFunction = IRP_MN_LOAD_FILE_SYSTEM; + + /* Call the driver */ + Status = IoCallDriver(AttachedDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on it */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + } } NTSTATUS @@ -347,12 +369,7 @@ case STATUS_FS_DRIVER_REQUIRED: DevObject = current->DeviceObject; ExReleaseResourceLite(&FileSystemListLock); - Status = IopLoadFileSystem(DevObject); - if (!NT_SUCCESS(Status)) - { - KeLeaveCriticalRegion(); - return(Status); - } + IopLoadFileSystem(DevObject); ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); goto restart; @@ -584,20 +601,26 @@ IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) { PFS_CHANGE_NOTIFY_ENTRY Entry; - - Entry = ExAllocatePoolWithTag(NonPagedPool, + PAGED_CODE(); + + /* Allocate a notification entry */ + Entry = ExAllocatePoolWithTag(PagedPool, sizeof(FS_CHANGE_NOTIFY_ENTRY), TAG_FS_CHANGE_NOTIFY); - if (Entry == NULL) return(STATUS_INSUFFICIENT_RESOURCES); - + if (!Entry) return(STATUS_INSUFFICIENT_RESOURCES); + + /* Save the driver object and notification routine */ Entry->DriverObject = DriverObject; Entry->FSDNotificationProc = FSDNotificationProc; + /* Insert it into the notification list */ KeAcquireGuardedMutex(&FsChangeNotifyListLock); - InsertHeadList(&FsChangeNotifyListHead, &Entry->FsChangeNotifyList); + InsertTailList(&FsChangeNotifyListHead, &Entry->FsChangeNotifyList); KeReleaseGuardedMutex(&FsChangeNotifyListLock); - return(STATUS_SUCCESS); + /* Reference the driver */ + ObReferenceObject(DriverObject); + return STATUS_SUCCESS; } /* @@ -609,20 +632,38 @@ IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) { PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; - - LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead, FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) - { - if (ChangeEntry->DriverObject == DriverObject && - ChangeEntry->FSDNotificationProc == FSDNotificationProc) - { - KeAcquireGuardedMutex(&FsChangeNotifyListLock); + PLIST_ENTRY NextEntry; + PAGED_CODE(); + + /* Acquire the list lock */ + KeAcquireGuardedMutex(&FsChangeNotifyListLock); + + /* Loop the list */ + NextEntry = FsChangeNotifyListHead.Flink; + while (NextEntry != &FsChangeNotifyListHead) + { + /* Get the entry */ + ChangeEntry = CONTAINING_RECORD(NextEntry, + FS_CHANGE_NOTIFY_ENTRY, + FsChangeNotifyList); + + /* Check if it matches this de-registration */ + if ((ChangeEntry->DriverObject == DriverObject) && + (ChangeEntry->FSDNotificationProc == FSDNotificationProc)) + { + /* It does, remove it from the list */ RemoveEntryList(&ChangeEntry->FsChangeNotifyList); - KeReleaseGuardedMutex(&FsChangeNotifyListLock); - ExFreePoolWithTag(ChangeEntry, TAG_FS_CHANGE_NOTIFY); - return; - } - } + break; + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Release the lock and dereference the driver */ + KeReleaseGuardedMutex(&FsChangeNotifyListLock); + ObDereferenceObject(DriverObject); } /* @@ -632,6 +673,7 @@ NTAPI IoAcquireVpbSpinLock(OUT PKIRQL Irql) { + /* Simply acquire the lock */ KeAcquireSpinLock(&IoVpbLock, Irql); } @@ -642,6 +684,7 @@ NTAPI IoReleaseVpbSpinLock(IN KIRQL Irql) { + /* Just release the lock */ KeReleaseSpinLock(&IoVpbLock, Irql); }

18 years, 5 months

[ion] 22756: - Implement some functions to handle VPB Referencing/Dereferencing. - IoVerifyVolume: - Send the IRP to the base FSD, in case the current FSD is an attachee - Set correct flags in the IRP to notify that this is a mount operation using PAGING I/O semantics. - Don't ignore AllowRawMount parameter. - We want to mount the File System on *FAILURE*, not on SUCCESS! - Add reference/dereferencing to the VPB.

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 2 05:35:45 2006 New Revision: 22756 URL: http://svn.reactos.org/svn/reactos?rev=22756&view=rev Log: - Implement some functions to handle VPB Referencing/Dereferencing. - IoVerifyVolume: - Send the IRP to the base FSD, in case the current FSD is an attachee - Set correct flags in the IRP to notify that this is a mount operation using PAGING I/O semantics. - Don't ignore AllowRawMount parameter. - We want to mount the File System on *FAILURE*, not on SUCCESS! - Add reference/dereferencing to the VPB. 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 05:35:45 2006 @@ -83,6 +83,60 @@ /* Link it to the Device Object */ DeviceObject->Vpb = Vpb; return STATUS_SUCCESS; +} + +VOID +NTAPI +IopDereferenceVpb(IN PVPB Vpb) +{ + KIRQL OldIrql; + + /* Lock the VPBs and decrease references */ + IoAcquireVpbSpinLock(&OldIrql); + Vpb->ReferenceCount--; + + /* Check if we're out of references */ + if (!Vpb->ReferenceCount) + { + /* FIXME: IMPLEMENT CLEANUP! */ + KEBUGCHECK(0); + } + + /* Release VPB lock */ + IoReleaseVpbSpinLock(OldIrql); +} + +BOOLEAN +NTAPI +IopReferenceVpbForVerify(IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_OBJECT *FileSystemObject, + OUT PVPB *Vpb) +{ + KIRQL OldIrql; + PVPB LocalVpb; + BOOLEAN Result = FALSE; + + /* Lock the VPBs and assume failure */ + IoAcquireVpbSpinLock(&OldIrql); + *Vpb = NULL; + *FileSystemObject = NULL; + + /* Get the VPB and make sure it's mounted */ + LocalVpb = DeviceObject->Vpb; + if ((LocalVpb) && (LocalVpb->Flags & VPB_MOUNTED)) + { + /* Return it */ + *Vpb = LocalVpb; + *FileSystemObject = LocalVpb->DeviceObject; + + /* Reference it */ + LocalVpb->ReferenceCount++; + Result = TRUE; + } + + /* Release the VPB lock and return status */ + IoReleaseVpbSpinLock(OldIrql); + return Result; } VOID @@ -335,73 +389,88 @@ PIO_STACK_LOCATION StackPtr; KEVENT Event; PIRP Irp; - NTSTATUS Status = STATUS_SUCCESS; - PDEVICE_OBJECT DevObject; - PVPB NewVpb; - + NTSTATUS Status = STATUS_SUCCESS, VpbStatus; + PDEVICE_OBJECT FileSystemDeviceObject; + PVPB Vpb, NewVpb; + BOOLEAN WasNotMounted = TRUE; + + /* Wait on the device lock */ KeWaitForSingleObject(&DeviceObject->DeviceLock, Executive, KernelMode, FALSE, NULL); - if (DeviceObject->Vpb->Flags & VPB_MOUNTED) - { - /* Issue verify request to the FSD */ - DevObject = DeviceObject->Vpb->DeviceObject; - + /* Reference the VPB */ + if (IopReferenceVpbForVerify(DeviceObject, &FileSystemDeviceObject, &Vpb)) + { + /* Initialize the event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoAllocateIrp(DevObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - + /* Find the actual File System DO */ + WasNotMounted = FALSE; + FileSystemDeviceObject = DeviceObject->Vpb->DeviceObject; + while (FileSystemDeviceObject->AttachedDevice) + { + /* Go to the next one */ + FileSystemDeviceObject = FileSystemDeviceObject->AttachedDevice; + } + + /* Allocate the IRP */ + Irp = IoAllocateIrp(FileSystemDeviceObject->StackSize, FALSE); + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set it up */ Irp->UserIosb = &IoStatusBlock; Irp->UserEvent = &Event; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - + Irp->Flags = IRP_MOUNT_COMPLETION | IRP_SYNCHRONOUS_PAGING_IO; + Irp->RequestorMode = KernelMode; + + /* Get the I/O Stack location and set it */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; StackPtr->MinorFunction = IRP_MN_VERIFY_VOLUME; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DevObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - StackPtr->Parameters.VerifyVolume.Vpb = DeviceObject->Vpb; - StackPtr->Parameters.VerifyVolume.DeviceObject = DeviceObject; - - Status = IoCallDriver(DevObject, Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); + StackPtr->Flags = AllowRawMount ? SL_ALLOW_RAW_MOUNT : 0; + StackPtr->Parameters.VerifyVolume.Vpb = Vpb; + StackPtr->Parameters.VerifyVolume.DeviceObject = + DeviceObject->Vpb->DeviceObject; + + /* Call the driver */ + Status = IoCallDriver(FileSystemDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on it */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = IoStatusBlock.Status; } - if (NT_SUCCESS(Status)) - { - KeSetEvent(&DeviceObject->DeviceLock, IO_NO_INCREMENT, FALSE); - return(STATUS_SUCCESS); - } - } - - if (Status == STATUS_WRONG_VOLUME) - { - /* Clean existing VPB. This unmounts the filesystem. */ - DPRINT("Wrong volume!\n"); - - DeviceObject->Vpb->DeviceObject = NULL; - DeviceObject->Vpb->Flags &= ~VPB_MOUNTED; - } - - /* Start mount sequence */ - Status = IopMountVolume(DeviceObject, AllowRawMount, TRUE, FALSE, &NewVpb); - + /* Dereference the VPB */ + IopDereferenceVpb(Vpb); + } + + /* Check if we had the wrong volume or didn't mount at all */ + if ((Status == STATUS_WRONG_VOLUME) || (WasNotMounted)) + { + /* Create a VPB */ + VpbStatus = IopCreateVpb(DeviceObject); + if (NT_SUCCESS(VpbStatus)) + { + /* Mount it */ + VpbStatus = IopMountVolume(DeviceObject, + AllowRawMount, + TRUE, + FALSE, + &NewVpb); + } + + /* If we failed, remove the verify flag */ + if (!NT_SUCCESS(VpbStatus)) DeviceObject->Flags &= ~DO_VERIFY_VOLUME; + } + + /* Signal the device lock and return */ KeSetEvent(&DeviceObject->DeviceLock, IO_NO_INCREMENT, FALSE); - return(Status); + return Status; } /*

18 years, 5 months

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