From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 16 Sep 2011 04:00:04 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: android-x86-6.0-r1~26^2~691
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=75405ffde6f87f88c7172bfb431ec085c542ec1a;p=android-x86%2Fexternal-e2fsprogs.git

Merge branch 'maint' into next
---

75405ffde6f87f88c7172bfb431ec085c542ec1a
diff --cc lib/ext2fs/ext2fs.h
index 3d8c3cb4,9e92e946..ed1a3ce5
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@@ -217,14 -195,13 +217,14 @@@ 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;
 -	int				inode_blocks_per_group;
 +	struct opaque_ext2_group_desc *	group_desc;
 +	unsigned int			inode_blocks_per_group;
  	ext2fs_inode_bitmap		inode_map;
  	ext2fs_block_bitmap		block_map;
 +	/* XXX FIXME-64: not 64-bit safe, but not used? */
  	errcode_t (*get_blocks)(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks);
  	errcode_t (*check_directory)(ext2_filsys fs, ext2_ino_t ino);
  	errcode_t (*write_bitmaps)(ext2_filsys fs);