diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2018-12-17 10:14:16 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-12-21 11:49:44 -0500 |
| commit | da3d76abb2e74c07b1cd620ee5e3b31227846c7c (patch) | |
| tree | 17f4296a73de0906026fe7800f65ff67e3c72111 /security | |
| parent | 169d68efb03b728588c209c682f14328eec485c0 (diff) | |
| download | linux-stable-da3d76abb2e74c07b1cd620ee5e3b31227846c7c.tar.gz linux-stable-da3d76abb2e74c07b1cd620ee5e3b31227846c7c.tar.bz2 linux-stable-da3d76abb2e74c07b1cd620ee5e3b31227846c7c.zip | |
selinux: regularize Opt_... names a bit
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 8f2285cb9029..9b350070ed9e 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -458,21 +458,21 @@ enum { Opt_fscontext = 2, Opt_defcontext = 3, Opt_rootcontext = 4, - Opt_labelsupport = 5, + Opt_seclabel = 5, }; -#define A(s, opt, has_arg) {s, sizeof(s) - 1, opt, has_arg} +#define A(s, has_arg) {#s, sizeof(#s) - 1, Opt_##s, has_arg} static struct { const char *name; int len; int opt; bool has_arg; } tokens[] = { - A("context", Opt_context, true), - A("fscontext", Opt_fscontext, true), - A("defcontext", Opt_defcontext, true), - A("rootcontext", Opt_rootcontext, true), - A("seclabel", Opt_labelsupport, false), + A(context, true), + A(fscontext, true), + A(defcontext, true), + A(rootcontext, true), + A(seclabel, false), }; #undef A @@ -1010,7 +1010,7 @@ static int selinux_add_opt(int token, const char *s, void **mnt_opts) { struct selinux_mnt_opts *opts = *mnt_opts; - if (token == Opt_labelsupport) /* eaten and completely ignored */ + if (token == Opt_seclabel) /* eaten and completely ignored */ return 0; if (!opts) { |