From 4bed73db388d769c1af98084d31c848944268530 Mon Sep 17 00:00:00 2001 From: Bo Branten Date: Tue, 18 Jun 2024 23:55:29 +0200 Subject: [PATCH] removed some double line breaks --- Ext4Fsd/ext3/generic.c | 25 ------------------------- Ext4Fsd/fsctl.c | 20 -------------------- Ext4Fsd/memory.c | 23 ----------------------- 3 files changed, 68 deletions(-) diff --git a/Ext4Fsd/ext3/generic.c b/Ext4Fsd/ext3/generic.c index fc86bca..e938a84 100644 --- a/Ext4Fsd/ext3/generic.c +++ b/Ext4Fsd/ext3/generic.c @@ -18,7 +18,6 @@ extern PEXT2_GLOBAL Ext2Global; /* DEFINITIONS *************************************************************/ - /* FUNCTIONS ***************************************************************/ NTSTATUS @@ -58,7 +57,6 @@ errorout: return Status; } - BOOLEAN Ext2SaveSuper( IN PEXT2_IRP_CONTEXT IrpContext, @@ -84,7 +82,6 @@ Ext2SaveSuper( return rc; } - BOOLEAN Ext2RefreshSuper ( IN PEXT2_IRP_CONTEXT IrpContext, @@ -149,7 +146,6 @@ Ext2PutGroup(IN PEXT2_VCB Vcb) struct ext4_sb_info *sbi = &Vcb->sbi; unsigned long i; - if (NULL == Vcb->sbi.s_gd) { return; } @@ -162,7 +158,6 @@ Ext2PutGroup(IN PEXT2_VCB Vcb) ClearFlag(Vcb->Flags, VCB_GD_LOADED); } - BOOLEAN Ext2LoadGroupBH(IN PEXT2_VCB Vcb) { @@ -199,7 +194,6 @@ Ext2LoadGroupBH(IN PEXT2_VCB Vcb) return rc; } - BOOLEAN Ext2LoadGroup(IN PEXT2_VCB Vcb) { @@ -295,7 +289,6 @@ Ext2DropBH(IN PEXT2_VCB Vcb) ClearFlag(Vcb->Flags, VCB_BEING_DROPPED); } - VOID Ext2FlushRange(IN PEXT2_VCB Vcb, LARGE_INTEGER s, LARGE_INTEGER e) { @@ -378,7 +371,6 @@ errorout: return STATUS_SUCCESS; } - BOOLEAN Ext2SaveGroup( IN PEXT2_IRP_CONTEXT IrpContext, @@ -401,7 +393,6 @@ Ext2SaveGroup( return TRUE; } - BOOLEAN Ext2RefreshGroup( IN PEXT2_IRP_CONTEXT IrpContext, @@ -500,7 +491,6 @@ void Ext2EncodeInode(struct ext4_inode *dst, struct inode *src) dst->i_extra_isize = src->i_extra_isize; } - BOOLEAN Ext2LoadInode (IN PEXT2_VCB Vcb, IN struct inode *Inode) @@ -533,7 +523,6 @@ Ext2LoadInode (IN PEXT2_VCB Vcb, return TRUE; } - BOOLEAN Ext2ClearInode ( IN PEXT2_IRP_CONTEXT IrpContext, @@ -671,7 +660,6 @@ errorout: return rc; } - BOOLEAN Ext2LoadBlock (IN PEXT2_VCB Vcb, IN ULONG Index, @@ -710,7 +698,6 @@ Ext2LoadBlock (IN PEXT2_VCB Vcb, return rc; } - BOOLEAN Ext2SaveBlock ( IN PEXT2_IRP_CONTEXT IrpContext, IN PEXT2_VCB Vcb, @@ -807,7 +794,6 @@ Ext2LoadBuffer( IN PEXT2_IRP_CONTEXT IrpContext, return rc; } - BOOLEAN Ext2ZeroBuffer( IN PEXT2_IRP_CONTEXT IrpContext, IN PEXT2_VCB Vcb, @@ -878,7 +864,6 @@ Ext2ZeroBuffer( IN PEXT2_IRP_CONTEXT IrpContext, return rc; } - BOOLEAN Ext2SaveBuffer( IN PEXT2_IRP_CONTEXT IrpContext, IN PEXT2_VCB Vcb, @@ -946,7 +931,6 @@ Ext2SaveBuffer( IN PEXT2_IRP_CONTEXT IrpContext, return rc; } - VOID Ext2UpdateVcbStat( IN PEXT2_IRP_CONTEXT IrpContext, @@ -1322,7 +1306,6 @@ errorout: return Status; } - NTSTATUS Ext2NewInode( IN PEXT2_IRP_CONTEXT IrpContext, @@ -1474,7 +1457,6 @@ repeat: for (j = 1; j < Vcb->sbi.s_groups_count; j <<= 1) { - i = (i + j) % Vcb->sbi.s_groups_count; gd = ext4_get_group_desc(sb, i, &gb); if (!gd) { @@ -1686,7 +1668,6 @@ errorout: if (gb) fini_bh(&gb); - return Status; } @@ -1727,7 +1708,6 @@ errorout: return status; } - NTSTATUS Ext2FreeInode( IN PEXT2_IRP_CONTEXT IrpContext, @@ -1841,7 +1821,6 @@ errorout: return Status; } - NTSTATUS Ext2AddEntry ( IN PEXT2_IRP_CONTEXT IrpContext, @@ -1913,7 +1892,6 @@ Ext2AddEntry ( return status; } - NTSTATUS Ext2SetFileType ( IN PEXT2_IRP_CONTEXT IrpContext, @@ -2156,7 +2134,6 @@ Ext2SetParentEntry ( } __finally { - if (Ext2DerefXcb(&Dcb->ReferenceCount) == 0) { DEBUG(DL_ERR, ( "Ext2SetParentEntry: Dcb reference goes to ZERO.\n")); } @@ -2203,7 +2180,6 @@ int ext3_check_dir_entry (const char * function, struct inode * dir, return error_msg == NULL ? 1 : 0; } - /* * p is at least 6 bytes before the end of page */ @@ -2902,7 +2878,6 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb, return desc; } - /** * ext4_count_free_blocks() -- count filesystem free blocks * @sb: superblock diff --git a/Ext4Fsd/fsctl.c b/Ext4Fsd/fsctl.c index d9cd484..f11c770 100644 --- a/Ext4Fsd/fsctl.c +++ b/Ext4Fsd/fsctl.c @@ -39,7 +39,6 @@ extern PEXT2_GLOBAL Ext2Global; #pragma alloc_text(PAGE, Ext2FileSystemControl) #endif - VOID Ext2SetVpbFlag ( IN PVPB Vpb, @@ -131,7 +130,6 @@ Ext2LockVcb (IN PEXT2_VCB Vcb, return Status; } - NTSTATUS Ext2LockVolume (IN PEXT2_IRP_CONTEXT IrpContext) { @@ -291,7 +289,6 @@ Ext2UnlockVolume ( return Status; } - NTSTATUS Ext2InvalidateVolumes ( IN PEXT2_IRP_CONTEXT IrpContext ) { @@ -325,7 +322,6 @@ Ext2InvalidateVolumes ( IN PEXT2_IRP_CONTEXT IrpContext ) __leave; } - #ifndef _GNU_NTIFS_ InputLength = IrpSp->Parameters.FileSystemControl.InputBufferLength; #else @@ -529,7 +525,6 @@ Ext2OplockRequest ( __leave; } - ASSERT((Ccb->Identifier.Type == EXT2CCB) && (Ccb->Identifier.Size == sizeof(EXT2_CCB))); @@ -578,7 +573,6 @@ Ext2OplockRequest ( Ext2BugCheck(EXT2_BUGCHK_FSCTL, FsCtrlCode, 0, 0); } - // // Call the FsRtl routine to grant/acknowledge oplock. // @@ -663,7 +657,6 @@ Ext2IsVolumeDirty ( return status; } - NTSTATUS Ext2QueryExtentMappings( IN PEXT2_IRP_CONTEXT IrpContext, @@ -904,7 +897,6 @@ Ext2QueryRetrievalPointers ( return Status; } - NTSTATUS Ext2GetRetrievalPointers ( IN PEXT2_IRP_CONTEXT IrpContext @@ -1378,8 +1370,6 @@ Ext2ReadSymlink ( BytesRead); } - - NTSTATUS Ext2GetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) { @@ -1512,7 +1502,6 @@ Ext2GetReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) return Status; } - NTSTATUS Ext2WriteSymlink ( IN PEXT2_IRP_CONTEXT IrpContext, @@ -1776,7 +1765,6 @@ out: return status; } - /* FIXME: We can only handle one reparse point right now. */ NTSTATUS Ext2DeleteReparsePoint (IN PEXT2_IRP_CONTEXT IrpContext) @@ -2375,7 +2363,6 @@ Ext2VerifyVcb (IN PEXT2_IRP_CONTEXT IrpContext, } - NTSTATUS Ext2VerifyVolume (IN PEXT2_IRP_CONTEXT IrpContext) { @@ -2432,7 +2419,6 @@ Ext2VerifyVolume (IN PEXT2_IRP_CONTEXT IrpContext) &ChangeCount, &dwBytes ); - if (!NT_SUCCESS(Status)) { Status = STATUS_WRONG_VOLUME; __leave; @@ -2491,7 +2477,6 @@ Ext2VerifyVolume (IN PEXT2_IRP_CONTEXT IrpContext) return Status; } - NTSTATUS Ext2IsVolumeMounted (IN PEXT2_IRP_CONTEXT IrpContext) { @@ -2504,7 +2489,6 @@ Ext2IsVolumeMounted (IN PEXT2_IRP_CONTEXT IrpContext) ASSERT((IrpContext->Identifier.Type == EXT2ICX) && (IrpContext->Identifier.Size == sizeof(EXT2_IRP_CONTEXT))); - DeviceObject = IrpContext->DeviceObject; Vcb = (PEXT2_VCB) DeviceObject->DeviceExtension; @@ -2518,7 +2502,6 @@ Ext2IsVolumeMounted (IN PEXT2_IRP_CONTEXT IrpContext) return Status; } - NTSTATUS Ext2DismountVolume (IN PEXT2_IRP_CONTEXT IrpContext) { @@ -2657,7 +2640,6 @@ Ext2CheckDismount ( DEBUG(DL_DBG, ("Ext2CheckDismount: Vpb: %p bDeleted=%d bTearDown=%d\n", Vpb, bDeleted, bTearDown)); - } else if (bForce) { DEBUG(DL_DBG, ( "Ext2CheckDismount: New/Old Vpb %p/%p Realdevice = %p\n", @@ -2820,7 +2802,6 @@ Ext2PurgeFile ( IN PEXT2_FCB Fcb, ASSERT((Fcb->Identifier.Type == EXT2FCB) && (Fcb->Identifier.Size == sizeof(EXT2_FCB))); - if (!IsVcbReadOnly(Fcb->Vcb) && FlushBeforePurge) { DEBUG(DL_INF, ( "Ext2PurgeFile: CcFlushCache on %wZ.\n", &Fcb->Mcb->FullName)); @@ -2845,7 +2826,6 @@ Ext2PurgeFile ( IN PEXT2_FCB Fcb, return STATUS_SUCCESS; } - NTSTATUS Ext2FileSystemControl (IN PEXT2_IRP_CONTEXT IrpContext) { diff --git a/Ext4Fsd/memory.c b/Ext4Fsd/memory.c index cd85408..7893194 100644 --- a/Ext4Fsd/memory.c +++ b/Ext4Fsd/memory.c @@ -126,7 +126,6 @@ Ext2FreeIrpContext (IN PEXT2_IRP_CONTEXT IrpContext) ExFreeToNPagedLookasideList(&(Ext2Global->Ext2IrpContextLookasideList), IrpContext); } - PEXT2_FCB Ext2AllocateFcb ( IN PEXT2_VCB Vcb, @@ -440,7 +439,6 @@ VOID Ext2FreeEntry (IN struct dentry *de) DEC_MEM_COUNT(PS_DENTRY, de, sizeof(struct dentry)); } - struct dentry *Ext2BuildEntry(PEXT2_VCB Vcb, PEXT2_MCB Dcb, PUNICODE_STRING FileName) { OEM_STRING Oem = { 0 }; @@ -539,7 +537,6 @@ Ext2JointExtents( List->Next = Extent; } - VOID Ext2DestroyExtentChain(IN PEXT2_EXTENT Chain) { @@ -641,7 +638,6 @@ Ext2ClearAllExtents(PLARGE_MCB Zone) } } - BOOLEAN Ext2AddVcbExtent ( IN PEXT2_VCB Vcb, @@ -783,7 +779,6 @@ Ext2LookupVcbExtent ( return rc; } - BOOLEAN Ext2AddMcbExtent ( IN PEXT2_VCB Vcb, @@ -934,7 +929,6 @@ Ext2LookupMcbExtent ( return rc; } - BOOLEAN Ext2AddMcbMetaExts ( IN PEXT2_VCB Vcb, @@ -1020,7 +1014,6 @@ Again: return rc; } - BOOLEAN Ext2AddBlockExtent( IN PEXT2_VCB Vcb, @@ -1054,7 +1047,6 @@ Ext2AddBlockExtent( return Ext2AddVcbExtent(Vcb, Vbn, Length); } - BOOLEAN Ext2LookupBlockExtent( IN PEXT2_VCB Vcb, @@ -1090,7 +1082,6 @@ Ext2LookupBlockExtent( return rc; } - BOOLEAN Ext2RemoveBlockExtent( IN PEXT2_VCB Vcb, @@ -1354,7 +1345,6 @@ Ext2BuildExtents( return Status; } - BOOLEAN Ext2BuildName( IN OUT PUNICODE_STRING Target, @@ -1589,7 +1579,6 @@ Ext2FreeMcb (IN PEXT2_VCB Vcb, IN PEXT2_MCB Mcb) DEC_MEM_COUNT(PS_MCB, Mcb, sizeof(EXT2_MCB)); } - PEXT2_MCB Ext2SearchMcb( PEXT2_VCB Vcb, @@ -1613,7 +1602,6 @@ Ext2SearchMcb( return Mcb; } - PEXT2_MCB Ext2SearchMcbWithoutLock( PEXT2_MCB Parent, @@ -1871,7 +1859,6 @@ Ext2CheckSetBlock(PEXT2_IRP_CONTEXT IrpContext, PEXT2_VCB Vcb, LONGLONG Block) return FALSE; } - RtlInitializeBitMap(&bitmap, (PULONG)bh->b_data, Length); if (RtlCheckBit(&bitmap, dwBlk) == 0) { @@ -1903,7 +1890,6 @@ Ext2CheckBitmapConsistency(PEXT2_IRP_CONTEXT IrpContext, PEXT2_VCB Vcb) Ext2CheckSetBlock(IrpContext, Vcb, ext4_block_bitmap(&Vcb->sb, gd)); Ext2CheckSetBlock(IrpContext, Vcb, ext4_inode_bitmap(&Vcb->sb, gd)); - if (i == Vcb->sbi.s_groups_count - 1) { InodeBlocks = ((INODES_COUNT % INODES_PER_GROUP) * Vcb->InodeSize + Vcb->BlockSize - 1) / @@ -1929,7 +1915,6 @@ Ext2InsertVcb(PEXT2_VCB Vcb) InsertTailList(&(Ext2Global->VcbList), &Vcb->Next); } - /* Ext2Global->Resource should be already acquired */ VOID Ext2RemoveVcb(PEXT2_VCB Vcb) @@ -2582,7 +2567,6 @@ Ext2InitializeVcb( IN PEXT2_IRP_CONTEXT IrpContext, Vcb->sbi.s_itb_per_group = Vcb->sbi.s_inodes_per_group / Vcb->sbi.s_inodes_per_block; - Vcb->sbi.s_desc_per_block = BLOCK_SIZE / GROUP_DESC_SIZE; Vcb->sbi.s_desc_per_block_bits = ilog2(Vcb->sbi.s_desc_per_block); @@ -2774,7 +2758,6 @@ Ext2InitializeVcb( IN PEXT2_IRP_CONTEXT IrpContext, return Status; } - VOID Ext2TearDownStream(IN PEXT2_VCB Vcb) { @@ -2857,7 +2840,6 @@ Ext2DestroyVcb (IN PEXT2_VCB Vcb) DEC_MEM_COUNT(PS_VCB, Vcb->DeviceObject, sizeof(EXT2_VCB)); } - /* uninitialize cache map */ VOID @@ -2869,7 +2851,6 @@ Ext2SyncUninitializeCacheMap ( NTSTATUS WaitStatus; LARGE_INTEGER Ext2LargeZero = {0,0}; - KeInitializeEvent( &UninitializeCompleteEvent.Event, SynchronizationEvent, FALSE); @@ -3026,7 +3007,6 @@ Ext2FirstUnusedMcb(PEXT2_VCB Vcb, BOOLEAN Wait, ULONG Number) return Head; } - /* Reaper thread to release unused Mcb blocks */ VOID Ext2McbReaperThread( @@ -3156,7 +3136,6 @@ Ext2McbReaperThread( PsTerminateSystemThread(STATUS_SUCCESS); } - /* get buffer heads from global Vcb BH list */ BOOLEAN @@ -3206,7 +3185,6 @@ Ext2QueryUnusedBH(PEXT2_VCB Vcb, PLIST_ENTRY head) return IsFlagOn(Vcb->Flags, VCB_BEING_DROPPED); } - /* Reaper thread to release unused buffer heads */ VOID Ext2bhReaperThread( @@ -3506,7 +3484,6 @@ Ext2StartReaper(PEXT2_REAPER Reaper, EXT2_REAPER_RELEASE Free) return status; } - VOID Ext2StopReaper(PEXT2_REAPER Reaper) {