diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2022-09-13 11:01:10 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2022-09-13 11:01:10 -0400 |
| commit | aad34909b6648579f42dade5af5b46821aa4d845 (patch) | |
| tree | 4866506ee1b65cb04fbd30e616f350c413d0d185 /misc/tune2fs.c | |
| parent | ed2850e8cfcfab44805dcc0e0a89dd4ecf31e344 (diff) | |
| parent | dbaedc87e9d048077385c3a07a5ffbde518e5d28 (diff) | |
| download | e2fsprogs-aad34909b6648579f42dade5af5b46821aa4d845.tar.gz | |
Merge branch 'maint' into next
Diffstat (limited to 'misc/tune2fs.c')
| -rw-r--r-- | misc/tune2fs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 9f0d4379..088f87e5 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -3344,8 +3344,6 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n" com_err("tune2fs", retval, "while recovering journal.\n"); printf(_("Please run e2fsck -fy %s.\n"), argv[1]); - if (fs) - ext2fs_close_free(&fs); rc = 1; goto closefs; } @@ -3483,6 +3481,7 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n" fputs(_("Error in using clear_mmp. " "It must be used with -f\n"), stderr); + rc = 1; goto closefs; } } @@ -3746,5 +3745,5 @@ closefs: if (feature_64bit) convert_64bit(fs, feature_64bit); - return (ext2fs_close_free(&fs) ? 1 : 0); + return (ext2fs_close_free(&fs) ? 1 : rc); } |