Whamcloud - gitweb
tune2fs: abort when trying to enable/disable metadata_csum on mounted fs
authorDarrick J. Wong <darrick.wong@oracle.com>
Tue, 27 Jan 2015 18:11:25 +0000 (13:11 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 27 Jan 2015 18:11:41 +0000 (13:11 -0500)
Earlier, I tried to make tune2fs abort if the user tried to enable or
disable metadata_csum on a mounted FS, but forgot the exit() call.
Supply it now.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
misc/tune2fs.c

index f01b05b..e33b0d3 100644 (file)
@@ -1110,9 +1110,11 @@ mmp_error:
                       EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
                if (check_fsck_needed(fs))
                        exit(1);
-               if (mount_flags & EXT2_MF_MOUNTED)
+               if (mount_flags & EXT2_MF_MOUNTED) {
                        fputs(_("Cannot enable metadata_csum on a mounted "
                                "filesystem!\n"), stderr);
+                       exit(1);
+               }
                if (!EXT2_HAS_INCOMPAT_FEATURE(fs->super,
                                EXT3_FEATURE_INCOMPAT_EXTENTS))
                        printf("%s",
@@ -1152,9 +1154,11 @@ mmp_error:
 
                if (check_fsck_needed(fs))
                        exit(1);
-               if (mount_flags & EXT2_MF_MOUNTED)
+               if (mount_flags & EXT2_MF_MOUNTED) {
                        fputs(_("Cannot disable metadata_csum on a mounted "
                                "filesystem!\n"), stderr);
+                       exit(1);
+               }
                rewrite_checksums = 1;
 
                /* Enable uninit_bg unless the user expressly turned it off */