mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
selinux: regularize Opt_... names a bit
Reviewed-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
169d68efb0
commit
da3d76abb2
1 changed files with 8 additions and 8 deletions
|
@ -458,21 +458,21 @@ enum {
|
||||||
Opt_fscontext = 2,
|
Opt_fscontext = 2,
|
||||||
Opt_defcontext = 3,
|
Opt_defcontext = 3,
|
||||||
Opt_rootcontext = 4,
|
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 {
|
static struct {
|
||||||
const char *name;
|
const char *name;
|
||||||
int len;
|
int len;
|
||||||
int opt;
|
int opt;
|
||||||
bool has_arg;
|
bool has_arg;
|
||||||
} tokens[] = {
|
} tokens[] = {
|
||||||
A("context", Opt_context, true),
|
A(context, true),
|
||||||
A("fscontext", Opt_fscontext, true),
|
A(fscontext, true),
|
||||||
A("defcontext", Opt_defcontext, true),
|
A(defcontext, true),
|
||||||
A("rootcontext", Opt_rootcontext, true),
|
A(rootcontext, true),
|
||||||
A("seclabel", Opt_labelsupport, false),
|
A(seclabel, false),
|
||||||
};
|
};
|
||||||
#undef A
|
#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;
|
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;
|
return 0;
|
||||||
|
|
||||||
if (!opts) {
|
if (!opts) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue