summaryrefslogtreecommitdiff
path: root/resize
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2010-06-07 12:42:40 -0400
committerTheodore Ts'o <tytso@mit.edu>2010-06-07 12:42:40 -0400
commit97d26ce9e3589e9f5fa17014467a9730a884d158 (patch)
tree1321a9170832aebc6c5017a70d6d73957cf31ba4 /resize
parentc561e751a17c85b898d74f8cc16daad5f29500a4 (diff)
parent296b9d696ab491f29d6d2083982e39b0ff3dab1f (diff)
downloade2fsprogs-97d26ce9e3589e9f5fa17014467a9730a884d158.tar.gz
Merge branch 'maint' into next
Conflicts: e2fsck/journal.c e2fsck/pass1.c e2fsck/pass2.c misc/mke2fs.c
Diffstat (limited to 'resize')
-rw-r--r--resize/main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/resize/main.c b/resize/main.c
index fd85d903..f5ffb0f6 100644
--- a/resize/main.c
+++ b/resize/main.c
@@ -345,6 +345,14 @@ int main (int argc, char ** argv)
min_size = calculate_minimum_resize_size(fs);
if (print_min_size) {
+ if (!force && ((fs->super->s_lastcheck < fs->super->s_mtime) ||
+ (fs->super->s_state & EXT2_ERROR_FS) ||
+ ((fs->super->s_state & EXT2_VALID_FS) == 0))) {
+ fprintf(stderr,
+ _("Please run 'e2fsck -f %s' first.\n\n"),
+ device_name);
+ exit(1);
+ }
printf(_("Estimated minimum size of the filesystem: %u\n"),
min_size);
exit(0);