mke2fs: Don't erase flash device if "-n" is given

If "mke2fs -n" is used, there should be no changes to the underlying
device.  Unfortunately, when the "discard" option was added in commit
c7cd908be5, it did not check for the "-n"
flag, and will discard all data on a flash device even if "-n" is given.

Check for the "noaction" flag before discarding any filesystem data.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
bitmap-optimize
Andreas Dilger 2011-06-07 10:22:29 -06:00 committed by Theodore Ts'o
parent bcb942c201
commit 8185ab9f38
1 changed files with 1 additions and 1 deletions

View File

@ -2142,7 +2142,7 @@ int main (int argc, char *argv[])
}
/* Can't undo discard ... */
if (discard && (io_ptr != undo_io_manager)) {
if (!noaction && discard && (io_ptr != undo_io_manager)) {
retval = mke2fs_discard_blocks(fs);
if (!retval && mke2fs_discard_zeroes_data(fs)) {