From acb3d41e17690352b87a6b429831625731417e2e Mon Sep 17 00:00:00 2001
From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Fri, 17 Aug 2007 20:22:07 -0500
Subject: [PATCH] --- yaml --- r: 67667 b: refs/heads/master c:
 9a5ad13856cbd10be429f09517c51277c02530f7 h: refs/heads/master i:   67665:
 7981ca1be11ba7e0502d87928107fc0ce997b203   67663:
 1bb7e8726d58dfd1680a74d408e4c81ce7ee45d9 v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/mount.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 336ff1e24a15..db4b7417efde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 382e6e256b0cb1a84a45a520cef75d1b8ff44663
+refs/heads/master: 9a5ad13856cbd10be429f09517c51277c02530f7
diff --git a/trunk/fs/gfs2/mount.c b/trunk/fs/gfs2/mount.c
index 4864659555d4..b941f9f9f958 100644
--- a/trunk/fs/gfs2/mount.c
+++ b/trunk/fs/gfs2/mount.c
@@ -42,6 +42,7 @@ enum {
 	Opt_nosuiddir,
 	Opt_data_writeback,
 	Opt_data_ordered,
+	Opt_err,
 };
 
 static match_table_t tokens = {
@@ -64,7 +65,8 @@ static match_table_t tokens = {
 	{Opt_suiddir, "suiddir"},
 	{Opt_nosuiddir, "nosuiddir"},
 	{Opt_data_writeback, "data=writeback"},
-	{Opt_data_ordered, "data=ordered"}
+	{Opt_data_ordered, "data=ordered"},
+	{Opt_err, NULL}
 };
 
 /**
@@ -237,6 +239,7 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount)
 		case Opt_data_ordered:
 			args->ar_data = GFS2_DATA_ORDERED;
 			break;
+		case Opt_err:
 		default:
 			fs_info(sdp, "unknown option: %s\n", o);
 			error = -EINVAL;