From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 17 Dec 2010 04:20:11 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.42-WIP-0702~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25623feab4789b86880da8ded5605ff17ebf3908;p=thirdparty%2Fe2fsprogs.git

Merge branch 'master' into next

Conflicts:
	e2fsck/e2fsck.h
	e2fsck/unix.c
---

25623feab4789b86880da8ded5605ff17ebf3908
diff --cc e2fsck/e2fsck.h
index d8038a5ec,a3772469c..486a71b05
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@@ -155,7 -155,7 +155,8 @@@ struct resource_track 
  #define E2F_OPT_WRITECHECK	0x0200
  #define E2F_OPT_COMPRESS_DIRS	0x0400
  #define E2F_OPT_FRAGCHECK	0x0800
 -#define E2F_OPT_DISCARD		0x1000
 +#define E2F_OPT_JOURNAL_ONLY	0x1000 /* only replay the journal */
++#define E2F_OPT_DISCARD		0x2000
  
  /*
   * E2fsck flags
diff --cc e2fsck/unix.c
index bb492d455,4cf55a93e..73cc2cf6a
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@@ -598,12 -594,12 +598,18 @@@ static void parse_extended_opts(e2fsck_
  		} else if (strcmp(token, "fragcheck") == 0) {
  			ctx->options |= E2F_OPT_FRAGCHECK;
  			continue;
 +		} else if (strcmp(token, "journal_only") == 0) {
 +			if (arg) {
 +				extended_usage++;
 +				continue;
 +			}
 +			ctx->options |= E2F_OPT_JOURNAL_ONLY;
+ 		} else if (strcmp(token, "discard") == 0) {
+ 			ctx->options |= E2F_OPT_DISCARD;
+ 			continue;
+ 		} else if (strcmp(token, "nodiscard") == 0) {
+ 			ctx->options &= ~E2F_OPT_DISCARD;
+ 			continue;
  		} else {
  			fprintf(stderr, _("Unknown extended option: %s\n"),
  				token);
@@@ -619,7 -615,8 +625,9 @@@
  		       "Valid extended options are:\n"), stderr);
  		fputs(("\tea_ver=<ea_version (1 or 2)>\n"), stderr);
  		fputs(("\tfragcheck\n"), stderr);
 +		fputs(("\tjournal_only\n"), stderr);
+ 		fputs(("\tdiscard\n"), stderr);
+ 		fputs(("\tnodiscard\n"), stderr);
  		fputc('\n', stderr);
  		exit(1);
  	}