diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2011-06-07 13:38:38 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2011-06-07 13:38:38 -0400 |
| commit | f16f9d92aa71fda1ababc48f1af6b6034214e537 (patch) | |
| tree | 3ee63616ede0cf8e29bd98e811b4712262e59628 /misc | |
| parent | 6a6337c3df7c982eb888764d585ec483a51af16e (diff) | |
| parent | 8185ab9f38f0e9cd06feab9d8e59d059bde84bf6 (diff) | |
| download | e2fsprogs-f16f9d92aa71fda1ababc48f1af6b6034214e537.tar.gz | |
Merge branch 'maint' into next
Conflicts:
misc/mke2fs.c
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/mke2fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 718e2736..0b7487f4 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -2136,7 +2136,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_device(fs); if (!retval && io_channel_discard_zeroes_data(fs->io)) { if (verbose) |