From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 1 Jun 2011 00:08:58 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42-WIP-0702~34
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=3977a4ff5b6d8f1a2a15d267308c52d42f31ba01;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	misc/tune2fs.c
---

3977a4ff5b6d8f1a2a15d267308c52d42f31ba01
diff --cc misc/tune2fs.c
index bcada11,7d5c092..3034885
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@@ -1711,16 -1713,17 +1717,16 @@@ retry_open
  		       interval);
  	}
  	if (m_flag) {
 -		sb->s_r_blocks_count = (unsigned int) (reserved_ratio *
 -					sb->s_blocks_count / 100.0);
 +		ext2fs_r_blocks_count_set(sb, reserved_ratio *
 +					  ext2fs_blocks_count(sb) / 100.0);
  		ext2fs_mark_super_dirty(fs);
 -		printf(_("Setting reserved blocks percentage to %g%% "
 -			 "(%u blocks)\n"),
 -		       reserved_ratio, sb->s_r_blocks_count);
 +		printf (_("Setting reserved blocks percentage to %g%% (%llu blocks)\n"),
 +			reserved_ratio, ext2fs_r_blocks_count(sb));
  	}
  	if (r_flag) {
- 		if (reserved_blocks >= ext2fs_blocks_count(sb)/2) {
 -		if (reserved_blocks > sb->s_blocks_count/2) {
++		if (reserved_blocks > ext2fs_blocks_count(sb)/2) {
  			com_err(program_name, 0,
 -				_("reserved blocks count is too big (%lu)"),
 +				_("reserved blocks count is too big (%llu)"),
  				reserved_blocks);
  			exit(1);
  		}