diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2008-04-27 07:59:28 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-04-27 07:59:28 -0400 |
| commit | da292aa9afe3ece2f6ab072ed88933b762ebdf4f (patch) | |
| tree | 98a4a9fb16c170cc3184e802aa07d18f2c9633ba /misc/mke2fs.c | |
| parent | d11736c6ddcd6e687d857bd902ed772311cd66bc (diff) | |
| parent | e7d9ce9a418ec63c0463d3609a560ead5b7d7afb (diff) | |
| download | e2fsprogs-da292aa9afe3ece2f6ab072ed88933b762ebdf4f.tar.gz | |
Merge branch 'maint'
Conflicts:
tests/m_raid_opt/expect.1
Diffstat (limited to 'misc/mke2fs.c')
| -rw-r--r-- | misc/mke2fs.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 11dffb70..8d25794e 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1572,7 +1572,16 @@ static void PRS(int argc, char *argv[]) fs_param.s_feature_compat = 0; fs_param.s_feature_ro_compat = 0; } - + + if ((fs_param.s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) && + (fs_param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)) { + fprintf(stderr, _("The resize_inode and meta_bg features " + "are not compatible.\n" + "They can not be both enabled " + "simultaneously.\n")); + exit(1); + } + /* Set first meta blockgroup via an environment variable */ /* (this is mostly for debugging purposes) */ if ((fs_param.s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) && |