diff --git a/Ext4Fsd/ext3/htree.c b/Ext4Fsd/ext3/htree.c index a2129a9..7b08b78 100644 --- a/Ext4Fsd/ext3/htree.c +++ b/Ext4Fsd/ext3/htree.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYRIGHT.TXT * PROJECT: Ext2 File System Driver for WinNT/2K/XP - * FILE: lock.c + * FILE: htree.c * PROGRAMMER: Matt Wu * HOMEPAGE: http://www.ext2fsd.com * UPDATE HISTORY: @@ -763,72 +763,7 @@ static int call_filldir(struct file * filp, void * cookie, } return 0; } -#if 0 -struct fake_dirent -{ - __le32 inode; - __le16 rec_len; - __u8 name_len; - __u8 file_type; -}; -struct dx_countlimit -{ - __le16 limit; - __le16 count; -}; - -struct dx_entry -{ - __le32 hash; - __le32 block; -}; - -/* - * dx_root_info is laid out so that if it should somehow get overlaid by a - * dirent the two low bits of the hash version will be zero. Therefore, the - * hash version mod 4 should never be 0. Sincerely, the paranoia department. - */ - -struct dx_root -{ - struct fake_dirent dot; - char dot_name[4]; - struct fake_dirent dotdot; - char dotdot_name[4]; - struct dx_root_info - { - __le32 reserved_zero; - __u8 hash_version; - __u8 info_length; /* 8 */ - __u8 indirect_levels; - __u8 unused_flags; - } - info; - struct dx_entry entries[0]; -}; - -struct dx_node -{ - struct fake_dirent fake; - struct dx_entry entries[0]; -}; - - -struct dx_frame -{ - struct buffer_head *bh; - struct dx_entry *entries; - struct dx_entry *at; -}; - -struct dx_map_entry -{ - __u32 hash; - __u16 offs; - __u16 size; -}; -#endif /* * Future: use high four bits of block for coalesce-on-delete flags * Mask them off for now. diff --git a/Ext4Fsd/fileinfo.c b/Ext4Fsd/fileinfo.c index 996186b..e9cbe89 100644 --- a/Ext4Fsd/fileinfo.c +++ b/Ext4Fsd/fileinfo.c @@ -388,11 +388,6 @@ Ext2QueryFileInformation (IN PEXT2_IRP_CONTEXT IrpContext) Irp->IoStatus.Information = sizeof(FILE_ALL_INFORMATION) + Mcb->ShortName.Length - sizeof(WCHAR); -#if 0 - sizeof(FILE_ACCESS_INFORMATION) - - sizeof(FILE_MODE_INFORMATION) - - sizeof(FILE_ALIGNMENT_INFORMATION); -#endif Status = STATUS_SUCCESS; } diff --git a/Ext4Fsd/include/asm/page.h b/Ext4Fsd/include/asm/page.h deleted file mode 100644 index e69de29..0000000 diff --git a/Ext4Fsd/include/asm/semaphore.h b/Ext4Fsd/include/asm/semaphore.h deleted file mode 100644 index e69de29..0000000 diff --git a/Ext4Fsd/include/asm/uaccess.h b/Ext4Fsd/include/asm/uaccess.h deleted file mode 100644 index e69de29..0000000 diff --git a/Ext4Fsd/jbd2/journal.c b/Ext4Fsd/jbd2/journal.c index ad9b1ee..cc78dd0 100644 --- a/Ext4Fsd/jbd2/journal.c +++ b/Ext4Fsd/jbd2/journal.c @@ -46,7 +46,7 @@ //#include //#include -#include +//#include #if 0 #ifdef CONFIG_JBD2_DEBUG ushort jbd2_journal_enable_debug __read_mostly; diff --git a/Ext4Fsd/memory.c b/Ext4Fsd/memory.c index 5a820d8..81f8bd7 100644 --- a/Ext4Fsd/memory.c +++ b/Ext4Fsd/memory.c @@ -2628,16 +2628,6 @@ Ext2InitializeVcb( IN PEXT2_IRP_CONTEXT IrpContext, } } - /* - * Mount ext4 with 64-bit block numbers read-only while testing. - */ -#if 0 - if (EXT3_HAS_INCOMPAT_FEATURE(&Vcb->sb, EXT4_FEATURE_INCOMPAT_64BIT)) { - printk(KERN_ERR "EXT3-fs: %s: Mounting ext4 with 64-bit block numbers read-only.\n", - Vcb->sb.s_id); - SetLongFlag(Vcb->Flags, VCB_READ_ONLY); - } -#endif has_huge_files = EXT3_HAS_RO_COMPAT_FEATURE(&Vcb->sb, EXT4_FEATURE_RO_COMPAT_HUGE_FILE); Vcb->sb.s_maxbytes = ext3_max_size(BLOCK_BITS, has_huge_files); diff --git a/README.md b/README.md index db9a7b4..b266bfc 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,10 @@ About and Visual Studio 2019. This is work in progress. If you need a stable driver you should get the latest official release from http://www.ext2fsd.com. If you want to try this branch you should still install the oficial release and then copy this driver over the old in \windows\system32\drivers. - The current status of the development is that all metadata checksums is implemented. To make a - filesystem to test this run mkfs.ext4 with the options -O "metadata_csum,^64bit". + The current status of the development is that all metadata checksums is implemented and jbd2 is + ported to support 64-bit blocknumbers. This work is dedicated to my mother Berit Ingegerd Branten. - Bo Branten. + Bo Branten Introduction