From: Theodore Ts'o Date: Sat, 26 Nov 2011 02:23:18 +0000 (-0500) Subject: libext2fs: move mmp fields to preserve structure layout of ext2_filsys X-Git-Tag: v1.42~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fff8636e54f762fcfe7312ec7c0428924ff7292;p=thirdparty%2Fe2fsprogs.git libext2fs: move mmp fields to preserve structure layout of ext2_filsys This helps provide better ABI compatibility for e2fsprogs 1.42. Signed-off-by: "Theodore Ts'o" --- diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index 08f194638..227ee5829 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -260,6 +260,13 @@ struct struct_ext2_filsys { struct ext2_inode_cache *icache; io_channel image_io; + /* + * More callback functions + */ + errcode_t (*get_alloc_block)(ext2_filsys fs, blk64_t goal, + blk64_t *ret); + void (*block_alloc_stats)(ext2_filsys fs, blk64_t blk, int inuse); + /* * Buffers for Multiple mount protection(MMP) block. */ @@ -271,13 +278,6 @@ struct struct_ext2_filsys { * Time at which e2fsck last updated the MMP block. */ long mmp_last_written; - - /* - * More callback functions - */ - errcode_t (*get_alloc_block)(ext2_filsys fs, blk64_t goal, - blk64_t *ret); - void (*block_alloc_stats)(ext2_filsys fs, blk64_t blk, int inuse); }; #if EXT2_FLAT_INCLUDES