bcad33d4cf
- Relax fsck requirements for resize2fs -P
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
(sent upstream, not yet merged/committed)
|
|
|
|
[PATCH] resize2fs: relax requirements for -P output a bit
|
|
|
|
Requiring an immediate pre-fsck before printing a minimum
|
|
resize size seems a bit draconian; if the fs isn't clean or marked
|
|
with error, then certainly, but for an informational minimum
|
|
size, I don't think we need to require a fsck since last mount.
|
|
|
|
I had simply copied the checks from the actual resize path,
|
|
previously.
|
|
|
|
Installers use this option (-P) to gather minimum resize info,
|
|
and requiring an actual fsck before use just seems to go too far.
|
|
|
|
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
|
---
|
|
|
|
diff --git a/resize/main.c b/resize/main.c
|
|
index 7c4f4dd..7d8b287 100644
|
|
--- a/resize/main.c
|
|
+++ b/resize/main.c
|
|
@@ -345,8 +345,7 @@ 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) ||
|
|
+ if (!force && ((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"),
|
|
|