From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 7 Jun 2011 17:38:38 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42-WIP-0702~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f16f9d92aa71fda1ababc48f1af6b6034214e537;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	misc/mke2fs.c
---

f16f9d92aa71fda1ababc48f1af6b6034214e537
diff --cc misc/mke2fs.c
index 718e27369,e28828ee6..0b7487f4b
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -2136,9 -2142,10 +2136,9 @@@ 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)) {
 +		retval = mke2fs_discard_device(fs);
 +		if (!retval && io_channel_discard_zeroes_data(fs->io)) {
  			if (verbose)
  				printf(_("Discard succeeded and will return 0s "
  					 " - skipping inode table wipe\n"));