From 8185ab9f38f0e9cd06feab9d8e59d059bde84bf6 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 7 Jun 2011 10:22:29 -0600 Subject: [PATCH] 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 c7cd908be59f48c66b4f3ac9a631ffe3dde4f1ab, 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 Reviewed-by: Eric Sandeen Signed-off-by: Theodore Ts'o --- misc/mke2fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/mke2fs.c b/misc/mke2fs.c index c46df6ce..e28828ee 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -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)) {