[Cluster-devel] [GFS2 PATCH 13/15] gfs2: ignore usr|grp|prjquota mount options

[Bob Peterson]

Before this patch, gfs2 rejected mounts attempted with the usrquota,
grpquota, or prjquota mount options. That caused numerous xfstests tests
to fail. This patch allows gfs2 to accept but ignore those mount options
so the tests may be run.

Signed-off-by: Bob Peterson <rpeterso at redhat.com>
---
 fs/gfs2/ops_fstype.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 8051f130cf53..69bdc2917fb5 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1373,6 +1373,7 @@ enum gfs2_param {
 	Opt_barrier,
 	Opt_rgrplvb,
 	Opt_loccookie,
+	Opt_ignore,
 };
 
 static const struct constant_table gfs2_param_quota[] = {
@@ -1431,6 +1432,9 @@ static const struct fs_parameter_spec gfs2_fs_parameters[] = {
 	/* quota can be a flag or an enum so it gets special treatment */
 	fsparam_flag_no("quota",	      Opt_quota_flag),
 	fsparam_enum("quota",		      Opt_quota, gfs2_param_quota),
+	fsparam_flag("usrquota",	      Opt_ignore),
+	fsparam_flag("grpquota",	      Opt_ignore),
+	fsparam_flag("prjquota",	      Opt_ignore),
 	{}
 };
 
@@ -1532,6 +1536,8 @@ static int gfs2_parse_param(struct fs_context *fc, struct fs_parameter *param)
 	case Opt_loccookie:
 		args->ar_loccookie = result.boolean;
 		break;
+	case Opt_ignore:
+		break;
 	default:
 		return invalfc(fc, "invalid mount option: %s", param->key);
 	}
-- 
2.31.1