vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'maint' into next 

Conflicts:
	misc/mke2fs.c
bitmap-optimize
Theodore Ts'o 2011-06-07 13:38:38 -04:00
parent 6a6337c3df 8185ab9f38
commit f16f9d92aa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/mke2fs.c
View File

@ -2136,7 +2136,7 @@ int main (int argc, char *argv[])
} }
/* Can't undo discard ... */ /* Can't undo discard ... */
if (discard && (io_ptr != undo_io_manager)) { if (!noaction && discard && (io_ptr != undo_io_manager)) {
retval = mke2fs_discard_device(fs); retval = mke2fs_discard_device(fs);
if (!retval && io_channel_discard_zeroes_data(fs->io)) { if (!retval && io_channel_discard_zeroes_data(fs->io)) {
if (verbose) if (verbose)