From 3fbfad558e01ffbacc14e5a536c4dfec0a0af4f5 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 15 Sep 2011 15:44:56 -0400 Subject: libext2fs: fix binary and source compatibility with the dump program The dump program relies on fs->frag_size and the EXT2_FRAGS_PER_BLOCK() macro. Kind of silly for it to do so, but it's part of the kludgy way the dump program (which was originally written for the BSD FFS was ported over to support ext2/3.) Given how it makes assumptions about the ext2/3/4 file system being similar to the BSD FFS, it's a bit of a miracle it works for ext4 --- or at least appears to work... Addresses-Debian-Bug: #636418 Signed-off-by: "Theodore Ts'o" --- lib/ext2fs/ext2fs.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/ext2fs/ext2fs.h') diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index 5379422b..9e92e946 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -195,7 +195,7 @@ struct struct_ext2_filsys { char * device_name; struct ext2_super_block * super; unsigned int blocksize; - int cluster_ratio_bits; + int fragsize; dgrp_t group_desc_count; unsigned long desc_blocks; struct ext2_group_desc * group_desc; @@ -216,10 +216,11 @@ struct struct_ext2_filsys { struct ext2_image_hdr * image_header; __u32 umask; time_t now; + int cluster_ratio_bits; /* * Reserved for future expansion */ - __u32 reserved[7]; + __u32 reserved[6]; /* * Reserved for the use of the calling application. -- cgit v1.2.3