From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 18 Mar 2011 20:44:37 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42-WIP-0702~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5af9eeaa7d36dd6f3a434697747ba8db3434eced;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	lib/e2p/ls.c
---

5af9eeaa7d36dd6f3a434697747ba8db3434eced
diff --cc lib/e2p/ls.c
index ca613150b,6785ced04..5e560edd5
--- a/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@@ -243,9 -223,12 +243,12 @@@ void list_super2(struct ext2_super_bloc
  	fprintf(f, "Filesystem OS type:       %s\n", str);
  	free(str);
  	fprintf(f, "Inode count:              %u\n", sb->s_inodes_count);
 -	fprintf(f, "Block count:              %u\n", sb->s_blocks_count);
 -	fprintf(f, "Reserved block count:     %u\n", sb->s_r_blocks_count);
 +	fprintf(f, "Block count:              %llu\n", e2p_blocks_count(sb));
 +	fprintf(f, "Reserved block count:     %llu\n", e2p_r_blocks_count(sb));
+ 	if (sb->s_overhead_blocks)
+ 		fprintf(f, "Overhead blocks:          %u\n",
+ 			sb->s_overhead_blocks);
 -	fprintf(f, "Free blocks:              %u\n", sb->s_free_blocks_count);
 +	fprintf(f, "Free blocks:              %llu\n", e2p_free_blocks_count(sb));
  	fprintf(f, "Free inodes:              %u\n", sb->s_free_inodes_count);
  	fprintf(f, "First block:              %u\n", sb->s_first_data_block);
  	fprintf(f, "Block size:               %u\n", EXT2_BLOCK_SIZE(sb));