commit 6a6337c3df7c982eb888764d585ec483a51af16e
author Theodore Ts'o <tytso@mit.edu> Sat Jun 04 20:24:36 2011 -0400
committer Theodore Ts'o <tytso@mit.edu> Sat Jun 04 20:24:36 2011 -0400
tree fb137967bee7878687c6561f48d4f4f8ceae2711
parent 7501ce3ee331b7cdb965ab95036090f2de91b5e0
parent bcb942c2013a92ff9a627ee79f14e52dba097538

Merge branch 'maint' into next

Conflicts:
	lib/ext2fs/bitmaps.c
	lib/ext2fs/rw_bitmaps.c
	misc/dumpe2fs.c

lib/ext2fs/bitmaps.c

diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c
index c53d61e..4f61d27 100644
--- a/lib/ext2fs/bitmaps.c
+++ b/lib/ext2fs/bitmaps.c
@@ -92,7 +92,7 @@
 
 	start = fs->super->s_first_data_block;
 	end = ext2fs_blocks_count(fs->super)-1;
-	real_end = ((__u64) EXT2_BLOCKS_PER_GROUP(fs->super)
+	real_end = ((__u64) EXT2_CLUSTERS_PER_GROUP(fs->super)
 		    * (__u64) fs->group_desc_count)-1 + start;
 
 	if (fs->flags & EXT2_FLAG_64BITS)