Merge branch 'maint' into next

Conflicts:
	misc/tune2fs.c

diff --cc misc/mke2fs.c
Simple merge

diff --cc misc/tune2fs.c
index bcada11,7d5c092..3034885
--- 1/misc/tune2fs.c
--- 2/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);
                }