Author: hpoussin
Date: Mon May 5 09:50:43 2008
New Revision: 33297
URL:
http://svn.reactos.org/svn/reactos?rev=33297&view=rev
Log:
Remove some warnings
Modified:
trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h
trunk/reactos/drivers/filesystems/ext2/src/cleanup.c
trunk/reactos/drivers/filesystems/ext2/src/close.c
trunk/reactos/drivers/filesystems/ext2/src/create.c
trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c
trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c
trunk/reactos/drivers/filesystems/ext2/src/ext2init.c
trunk/reactos/drivers/filesystems/ext2/src/fastio.c
trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c
trunk/reactos/drivers/filesystems/ext2/src/flush.c
trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c
trunk/reactos/drivers/filesystems/ext2/src/io.c
trunk/reactos/drivers/filesystems/ext2/src/metadata.c
trunk/reactos/drivers/filesystems/ext2/src/misc.c
trunk/reactos/drivers/filesystems/ext2/src/read.c
trunk/reactos/drivers/filesystems/ext2/src/shutdown.c
trunk/reactos/drivers/filesystems/ext2/src/volinfo.c
trunk/reactos/drivers/filesystems/ext2/src/write.c
Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] Mon May 5 09:50:43
2008
@@ -130,8 +130,9 @@
}
#ifdef EXT2_POOL_WITH_TAG
+ #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) +
((D)<<24))
#define Ext2AllocatePool(PoolType,NumberOfBytes) \
- ExAllocatePoolWithTag( PoolType, NumberOfBytes, '2txE' )
+ ExAllocatePoolWithTag( PoolType, NumberOfBytes, TAG (
'E','x','t','2' ) )
#else
#define Ext2AllocatePool(PoolType,NumberOfBytes) \
ExAllocatePool( PoolType, NumberOfBytes )
Modified: trunk/reactos/drivers/filesystems/ext2/src/cleanup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/cleanup.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/cleanup.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -113,12 +113,10 @@
PtrExt2VCB PtrVCB = NULL;
PtrExt2NTRequiredFCB PtrReqdFCB = NULL;
PERESOURCE PtrResourceAcquired = NULL;
- IO_STATUS_BLOCK LocalIoStatus;
BOOLEAN CompleteIrp = TRUE;
BOOLEAN PostRequest = FALSE;
BOOLEAN AcquiredVCB = FALSE;
- BOOLEAN CanWait = FALSE;
BOOLEAN BlockForResource;
int i = 1;
Modified: trunk/reactos/drivers/filesystems/ext2/src/close.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/close.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/close.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -115,12 +115,10 @@
PtrExt2VCB PtrVCB = NULL;
PtrExt2NTRequiredFCB PtrReqdFCB = NULL;
PERESOURCE PtrResourceAcquired = NULL;
- IO_STATUS_BLOCK LocalIoStatus;
BOOLEAN CompleteIrp = TRUE;
BOOLEAN PostRequest = FALSE;
BOOLEAN AcquiredVCB = FALSE;
- BOOLEAN CanWait = FALSE;
BOOLEAN BlockForResource;
int i = 1;
Modified: trunk/reactos/drivers/filesystems/ext2/src/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/create.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/create.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -180,8 +180,6 @@
UNICODE_STRING AbsolutePathName;
UNICODE_STRING RenameLinkTargetFileName;
- LARGE_INTEGER FileAllocationSize, FileEndOfFile;
-
ASSERT(PtrIrpContext);
ASSERT(PtrIrp);
@@ -472,12 +470,10 @@
UNICODE_STRING RemainingName;
UNICODE_STRING CurrentName;
UNICODE_STRING NextRemainingName;
- PEXT2_INODE PtrNextInode = NULL;
ULONG CurrInodeNo = 0;
PtrExt2FCB PtrCurrFCB = NULL;
PtrExt2FCB PtrNextFCB = NULL;
PFILE_OBJECT PtrCurrFileObject = NULL;
- UINT NameBufferIndex;
ULONG Type = 0;
LARGE_INTEGER ZeroSize;
BOOLEAN Found = FALSE;
@@ -527,7 +523,6 @@
if( OpenTargetDirectory )
{
- int i;
//
// This is for a rename/move operation...
//
@@ -580,10 +575,10 @@
// Quit searching...
//
- if( ( NextRemainingName.Length == 0 ) &&
+ if( ( NextRemainingName.Length == 0 ) && (
( RequestedDisposition == FILE_CREATE ) ||
( RequestedDisposition == FILE_OPEN_IF) ||
- ( RequestedDisposition == FILE_OVERWRITE_IF) )
+ ( RequestedDisposition == FILE_OVERWRITE_IF) ) )
{
//
@@ -618,7 +613,6 @@
}
else if( NextRemainingName.Length == 0 && OpenTargetDirectory )
{
- int i;
//
// This is for a rename/move operation...
// Just the last component was not found...
@@ -1163,7 +1157,6 @@
{
PtrExt2FCB PtrFCB = NULL;
- ULONG InodeNo = 0;
PLIST_ENTRY PtrEntry;
if( IsListEmpty( &(PtrVCB->FCBListHead) ) )
@@ -1222,7 +1215,6 @@
ULONG *Type )
{
- PtrExt2FCB PtrNewFCB = NULL;
PFILE_OBJECT PtrFileObject = NULL;
ULONG InodeNo = 0;
@@ -1637,7 +1629,6 @@
{
EXT2_INODE Inode;
PtrExt2VCB PtrVCB = PtrFCB->PtrVCB;
- ULONG i;
Ext2InitializeFCBInodeInfo( PtrFCB );
Modified: trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -125,7 +125,6 @@
PtrExt2CCB PtrCCB = NULL;
PtrExt2VCB PtrVCB = NULL;
ULONG IoControlCode = 0;
- void *BufferPointer = NULL;
try
{
@@ -165,9 +164,6 @@
IoSetCompletionRoutine(PtrIrp, Ext2DevIoctlCompletion, NULL, TRUE, TRUE, TRUE);
// Send the request.
RC = IoCallDriver(PtrVCB->TargetDeviceObject, PtrIrp);
-
- try_exit: NOTHING;
-
}
finally
{
Modified: trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -109,7 +109,6 @@
PFILE_OBJECT PtrFileObject = NULL;
PtrExt2FCB PtrFCB = NULL;
PtrExt2CCB PtrCCB = NULL;
- PtrExt2VCB PtrVCB = NULL;
// First, get a pointer to the current I/O stack location
PtrIoStackLocation = IoGetCurrentIrpStackLocation(PtrIrp);
@@ -189,7 +188,6 @@
PtrExt2CCB PtrCCB)
{
NTSTATUS RC = STATUS_SUCCESS;
- BOOLEAN CompleteRequest = TRUE;
BOOLEAN PostRequest = FALSE;
PtrExt2NTRequiredFCB PtrReqdFCB = NULL;
BOOLEAN CanWait = FALSE;
@@ -212,9 +210,7 @@
BOOLEAN SearchWithWildCards = FALSE;
PFILE_BOTH_DIR_INFORMATION BothDirInformation = NULL;
- PFILE_FULL_DIR_INFORMATION FullDirInformation = NULL;
PFILE_DIRECTORY_INFORMATION DirectoryInformation = NULL;
- PFILE_NAMES_INFORMATION NamesInformation = NULL;
PEXT2_DIR_ENTRY PtrDirEntry = NULL;
@@ -233,7 +229,7 @@
PBCB PtrBCB = NULL;
BYTE * PtrPinnedBlockBuffer = NULL;
- unsigned int i,j;
+ unsigned int j;
DebugTrace(DEBUG_TRACE_MISC, " === Querying Directory %S",
PtrFCB->FCBName->ObjectName.Buffer );
Modified: trunk/reactos/drivers/filesystems/ext2/src/ext2init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/ext2init.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/ext2init.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -49,7 +49,6 @@
{
NTSTATUS RC = STATUS_SUCCESS;
UNICODE_STRING DriverDeviceName;
- BOOLEAN RegisteredShutdown = FALSE;
#if 0
Ext2BreakPoint();
@@ -128,7 +127,7 @@
// create a device object representing the driver itself
// so that requests can be targeted to the driver ...
// e.g. for a disk-based FSD, "mount" requests will be sent to
- // this device object by the I/O Manager.\
+ // this device object by the I/O Manager.
// For a redirector/server, you may have applications
// send "special" IOCTL's using this device object ...
RtlInitUnicodeString(&DriverDeviceName, EXT2_FS_NAME);
@@ -136,10 +135,10 @@
DriverObject, // our driver object
0, // don't need an extension for this object
&DriverDeviceName,// name - can be used to "open" the driver
- // see the book for alternate choices
+ // see the book for alternate choices
FILE_DEVICE_DISK_FILE_SYSTEM,
0, // no special characteristics
- // do not want this as an exclusive device, though you might
+ // do not want this as an exclusive device, though you might
FALSE,
&(Ext2GlobalData.Ext2DeviceObject))))
{
Modified: trunk/reactos/drivers/filesystems/ext2/src/fastio.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/fastio.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/fastio.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -191,9 +191,6 @@
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
} finally {
}
@@ -257,9 +254,6 @@
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -321,9 +315,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -384,9 +375,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -452,9 +440,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -519,9 +504,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -582,9 +564,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -646,9 +625,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -931,8 +907,6 @@
IN PVOID Context)
{
- BOOLEAN ReturnedStatus = TRUE;
-
PtrExt2VCB PtrVCB = NULL;
PtrExt2FCB PtrFCB = NULL;
PtrExt2CCB PtrCCB = NULL;
@@ -1105,7 +1079,6 @@
void NTAPI Ext2RelReadAhead(
IN PVOID Context)
{
- BOOLEAN ReturnedStatus = TRUE;
PtrExt2FCB PtrFCB = NULL;
PtrExt2CCB PtrCCB = NULL;
PtrExt2NTRequiredFCB PtrReqdFCB = NULL;
@@ -1211,9 +1184,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -1278,9 +1248,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -1345,9 +1312,6 @@
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -1411,9 +1375,6 @@
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -1476,9 +1437,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -1556,9 +1514,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -1621,9 +1576,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -1681,9 +1633,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
@@ -1740,9 +1689,6 @@
RC = Ext2ExceptionHandler(PtrIrpContext, NULL);
Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC);
}
-
- try_exit: NOTHING;
-
}
finally
{
Modified: trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -115,7 +115,6 @@
BOOLEAN MainResourceAcquired = FALSE;
BOOLEAN VCBResourceAcquired = FALSE;
BOOLEAN PagingIoResourceAcquired = FALSE;
- IO_STATUS_BLOCK LocalIoStatus;
void *PtrSystemBuffer = NULL;
long BufferLength = 0;
FILE_INFORMATION_CLASS FunctionalityRequested;
@@ -894,8 +893,6 @@
{
Ext2ClearFlag(PtrFileObject->Flags, FO_TEMPORARY_FILE);
}
-
- try_exit: NOTHING;
}
finally
{
Modified: trunk/reactos/drivers/filesystems/ext2/src/flush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/flush.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/flush.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -282,8 +282,6 @@
PtrExt2VCB PtrVCB)
{
BOOLEAN AcquiredVCB = FALSE;
- PtrExt2FCB PtrFCB = NULL;
- PLIST_ENTRY PtrNextFCB = NULL;
try {
ExAcquireResourceExclusiveLite(&(PtrVCB->VCBResource), TRUE);
@@ -335,8 +333,6 @@
PIRP PtrIrp,
PVOID Context)
{
- NTSTATUS RC = STATUS_SUCCESS;
-
if (PtrIrp->PendingReturned) {
IoMarkIrpPending(PtrIrp);
}
Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -895,8 +895,6 @@
DebugTrace(DEBUG_TRACE_FSCTRL, "Unknown FSCTRL !!!", 0);
}
-
- try_exit: NOTHING;
}
finally
{
Modified: trunk/reactos/drivers/filesystems/ext2/src/io.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/io.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/io.c [iso-8859-1] Mon May 5 09:50:43 2008
@@ -242,15 +242,7 @@
PEXT2_IO_CONTEXT PtrIoContext = NULL;
PKEVENT PtrSyncEvent = NULL;
- PVOID PtrReadBuffer = NULL;
- ULONG ReadBufferLength = 0;
-
- ULONG LogicalBlockNo = 0;
- ULONG LogicalBlockSize = 0;
- ULONG PhysicalBlockSize = 0;
-
- uint32 NumberBytesRead = 0;
- int i;
+
PIO_STACK_LOCATION PtrIrpNextSp = NULL;
try
Modified: trunk/reactos/drivers/filesystems/ext2/src/metadata.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/metadata.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/metadata.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -472,8 +472,6 @@
}
}
-
- try_exit: NOTHING;
}
finally
{
@@ -713,8 +711,6 @@
// The Read Buffer Pointer
BYTE * PtrPinnedBuffer = NULL;
-
- PEXT2_INODE PtrTempInode;
// Buffer Control Block
PBCB PtrBCB = NULL;
@@ -841,7 +837,6 @@
PtrExt2VCB PtrVCB;
LARGE_INTEGER VolumeByteOffset;
unsigned long LogicalBlockSize = 0;
- unsigned long NumberOfBytesToRead = 0;
BOOLEAN RC = FALSE;
USHORT HeaderLength = sizeof( EXT2_DIR_ENTRY );
@@ -1071,7 +1066,6 @@
PBCB PtrDataBlockBCB = NULL;
BYTE * PtrDataBlock = NULL;
PFILE_OBJECT PtrFileObject = NULL;
- PEXT2_DIR_ENTRY PtrTempDirEntry;
LONGLONG ByteOffset = 0;
PtrExt2VCB PtrVCB;
LARGE_INTEGER VolumeByteOffset;
@@ -2598,9 +2592,6 @@
BYTE * PtrPinnedBlockBuffer = NULL;
PEXT2_DIR_ENTRY PtrDirEntry = NULL;
BOOLEAN Found = FALSE;
- int i;
-
-
StartBufferOffset.QuadPart = 0;
Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -205,9 +205,6 @@
DebugTrace( DEBUG_TRACE_FREE, "Freeing = %lX [misc]",
Ext2GlobalData.IrpContextZone);
ExFreePool(Ext2GlobalData.IrpContextZone);
-
- try_exit: NOTHING;
-
}
finally
{
@@ -429,7 +426,7 @@
{
PtrExt2ObjectName PtrObjectName = NULL;
BOOLEAN AllocatedFromZone = TRUE;
- KIRQL CurrentIrql;
+ //KIRQL CurrentIrql;
/*
// first, try to allocate out of the zone
KeAcquireSpinLock(&(Ext2GlobalData.ZoneAllocationSpinLock), &CurrentIrql);
@@ -491,7 +488,9 @@
void NTAPI Ext2ReleaseObjectName(
PtrExt2ObjectName PtrObjectName)
{
+#ifdef USE_ZONES
KIRQL CurrentIrql;
+#endif
ASSERT(PtrObjectName);
PtrObjectName->NodeIdentifier.NodeType = EXT2_NODE_TYPE_FREED;
@@ -540,7 +539,9 @@
{
PtrExt2CCB PtrCCB = NULL;
BOOLEAN AllocatedFromZone = TRUE;
- KIRQL CurrentIrql;
+#ifdef USE_ZONES
+ KIRQL CurrentIrql;
+#endif
#ifdef USE_ZONES
@@ -608,7 +609,9 @@
void NTAPI Ext2ReleaseCCB(
PtrExt2CCB PtrCCB)
{
+#ifdef USE_ZONES
KIRQL CurrentIrql;
+#endif
ASSERT( PtrCCB );
if(PtrCCB->NodeIdentifier.NodeType != EXT2_NODE_TYPE_CCB)
@@ -665,7 +668,9 @@
{
PtrExt2FCB PtrFCB = NULL;
BOOLEAN AllocatedFromZone = TRUE;
+#ifdef USE_ZONES
KIRQL CurrentIrql;
+#endif
// first, try to allocate out of the zone
#ifdef USE_ZONES
@@ -862,7 +867,7 @@
void NTAPI Ext2ReleaseFCB(
PtrExt2FCB PtrFCB)
{
- KIRQL CurrentIrql;
+ //KIRQL CurrentIrql;
AssertFCB( PtrFCB );
@@ -1025,7 +1030,7 @@
{
PtrExt2IrpContext PtrIrpContext = NULL;
BOOLEAN AllocatedFromZone = TRUE;
- KIRQL CurrentIrql;
+ //KIRQL CurrentIrql;
PIO_STACK_LOCATION PtrIoStackLocation = NULL;
/*
@@ -1611,8 +1616,6 @@
OUT PtrExt2CCB *PPtrCCB,
OUT PtrExt2VCB *PPtrVCB )
{
- int Offset;
-
(*PPtrCCB) = (PtrExt2CCB)(PtrFileObject->FsContext2);
if( *PPtrCCB )
{
Modified: trunk/reactos/drivers/filesystems/ext2/src/read.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/read.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/read.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -117,10 +117,8 @@
PtrExt2VCB PtrVCB = NULL;
PtrExt2NTRequiredFCB PtrReqdFCB = NULL;
PERESOURCE PtrResourceAcquired = NULL;
- IO_STATUS_BLOCK LocalIoStatus;
PVOID PtrSystemBuffer = NULL;
PVOID PtrPinnedReadBuffer = NULL;
- uint32 KeyValue = 0;
BOOLEAN CompleteIrp = TRUE;
BOOLEAN PostRequest = FALSE;
@@ -129,13 +127,7 @@
BOOLEAN PagingIo = FALSE;
BOOLEAN NonBufferedIo = FALSE;
BOOLEAN SynchronousIo = FALSE;
- BOOLEAN MdlLocked = FALSE;
BOOLEAN ReadTruncated = FALSE;
-
- LARGE_INTEGER StartPhysicalBlock;
- ULONG NoOfBlocks = 0;
-
- PIO_STACK_LOCATION PtrIrpNextSp = NULL;
// Used to cache the Single Indirect blocks pointed to by
// the Double Indirect block
@@ -162,7 +154,7 @@
PBCB PtrPinnedDIndirectBCB = NULL;
PBCB PtrPinnedTIndirectBCB = NULL;
- int i, Index;
+ int Index;
try
{
Modified: trunk/reactos/drivers/filesystems/ext2/src/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/shutdown.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/shutdown.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -108,7 +108,6 @@
{
NTSTATUS RC = STATUS_SUCCESS;
PIO_STACK_LOCATION PtrIoStackLocation = NULL;
- IO_STATUS_BLOCK LocalIoStatus;
try
{
@@ -197,8 +196,6 @@
}
*/////////////////////////////////////////////
- try_exit: NOTHING;
-
}
finally
{
Modified: trunk/reactos/drivers/filesystems/ext2/src/volinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/volinfo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/volinfo.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -174,7 +174,6 @@
Status = STATUS_BUFFER_OVERFLOW;
DebugTrace(DEBUG_TRACE_MISC, " === Buffer insufficient", 0);
}
- try_exit: NOTHING;
}
finally
{
Modified: trunk/reactos/drivers/filesystems/ext2/src/write.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/ext2/src/write.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/ext2/src/write.c [iso-8859-1] Mon May 5 09:50:43
2008
@@ -113,9 +113,7 @@
PtrExt2VCB PtrVCB = NULL;
PtrExt2NTRequiredFCB PtrReqdFCB = NULL;
PERESOURCE PtrResourceAcquired = NULL;
- IO_STATUS_BLOCK LocalIoStatus;
void *PtrSystemBuffer = NULL;
- uint32 KeyValue = 0;
BOOLEAN CompleteIrp = TRUE;
BOOLEAN PostRequest = FALSE;