From: Eric Paris <eparis@redhat.com>
Date: Fri, 24 Aug 2012 19:58:53 +0000 (-0400)
Subject: SELinux: make it harder to get the number of mnt opts wrong
X-Git-Tag: v3.13-rc1~18^2~52^2~3^2~12
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d355987f47bbe24e7450b509a3f8aac0db88b65a;p=pandora-kernel.git

SELinux: make it harder to get the number of mnt opts wrong

Instead of just hard coding a value, use the enum to out benefit.

Signed-off-by: Eric Paris <eparis@redhat.com>
---

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 42b538ceb8b4..863f20590186 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -94,8 +94,6 @@
 #include "audit.h"
 #include "avc_ss.h"
 
-#define NUM_SEL_MNT_OPTS 5
-
 extern struct security_operations *security_ops;
 
 /* SECMARK reference count */
@@ -307,8 +305,11 @@ enum {
 	Opt_defcontext = 3,
 	Opt_rootcontext = 4,
 	Opt_labelsupport = 5,
+	Opt_nextmntopt = 6,
 };
 
+#define NUM_SEL_MNT_OPTS	(Opt_nextmntopt - 1)
+
 static const match_table_t tokens = {
 	{Opt_context, CONTEXT_STR "%s"},
 	{Opt_fscontext, FSCONTEXT_STR "%s"},