2008-03-17 20:29:51

by Adrian Bunk

Subject: [2.6 patch] make selinux_parse_opts_str() static

This patch makes the needlessly global selinux_parse_opts_str() static.

Signed-off-by: Adrian Bunk <[email protected]>

---
42740a04634e3a4362a688b29ad31ee87c940ff7 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 4bf4807..41a049f 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -800,7 +800,8 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb,
mutex_unlock(&newsbsec->lock);
}

-int selinux_parse_opts_str(char *options, struct security_mnt_opts *opts)
+static int selinux_parse_opts_str(char *options,
+ struct security_mnt_opts *opts)
{
char *p;
char *context = NULL, *defcontext = NULL;

2008-03-17 21:39:25

by Eric Paris

Subject: Re: [2.6 patch] make selinux_parse_opts_str() static

On Mon, 2008-03-17 at 22:29 +0200, Adrian Bunk wrote:
> This patch makes the needlessly global selinux_parse_opts_str() static.
>
> Signed-off-by: Adrian Bunk <[email protected]>

Ack-ed by: Eric Paris <[email protected]>

whoops, sorry.

> ---
> 42740a04634e3a4362a688b29ad31ee87c940ff7 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 4bf4807..41a049f 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -800,7 +800,8 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb,
> mutex_unlock(&newsbsec->lock);
> }
>
> -int selinux_parse_opts_str(char *options, struct security_mnt_opts *opts)
> +static int selinux_parse_opts_str(char *options,
> + struct security_mnt_opts *opts)
> {
> char *p;
> char *context = NULL, *defcontext = NULL;
>

2008-03-17 22:34:18

by James Morris

Subject: Re: [2.6 patch] make selinux_parse_opts_str() static

On Mon, 17 Mar 2008, Eric Paris wrote:

> On Mon, 2008-03-17 at 22:29 +0200, Adrian Bunk wrote:
> > This patch makes the needlessly global selinux_parse_opts_str() static.
> >
> > Signed-off-by: Adrian Bunk <[email protected]>
>
> Ack-ed by: Eric Paris <[email protected]>

ITYM Acked-by :-)

Applied to for-linus.


>
> whoops, sorry.
>
> > ---
> > 42740a04634e3a4362a688b29ad31ee87c940ff7 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> > index 4bf4807..41a049f 100644
> > --- a/security/selinux/hooks.c
> > +++ b/security/selinux/hooks.c
> > @@ -800,7 +800,8 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb,
> > mutex_unlock(&newsbsec->lock);
> > }
> >
> > -int selinux_parse_opts_str(char *options, struct security_mnt_opts *opts)
> > +static int selinux_parse_opts_str(char *options,
> > + struct security_mnt_opts *opts)
> > {
> > char *p;
> > char *context = NULL, *defcontext = NULL;
> >
>

--
James Morris
<[email protected]>