2008-01-28 22:17:36

by Adrian Bunk

Subject: [2.6 patch] make selinux_set_mnt_opts() static

selinux_set_mnt_opts() can become static.

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

---
d9cfb159caa25ed5ad3dee35d62a6e1a0bd51ef6
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 0396354..04eeab7 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -561,8 +561,8 @@ static int bad_option(struct superblock_security_struct *sbsec, char flag,
* Allow filesystems with binary mount data to explicitly set mount point
* labeling information.
*/
-int selinux_set_mnt_opts(struct super_block *sb, char **mount_options,
- int *flags, int num_opts)
+static int selinux_set_mnt_opts(struct super_block *sb, char **mount_options,
+ int *flags, int num_opts)
{
int rc = 0, i;
struct task_security_struct *tsec = current->security;

2008-01-28 22:38:48

by James Morris

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

On Tue, 29 Jan 2008, Adrian Bunk wrote:

> selinux_set_mnt_opts() can become static.
>
> Signed-off-by: Adrian Bunk <[email protected]>
>

Thanks, applied.


> ---
> d9cfb159caa25ed5ad3dee35d62a6e1a0bd51ef6
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 0396354..04eeab7 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -561,8 +561,8 @@ static int bad_option(struct superblock_security_struct *sbsec, char flag,
> * Allow filesystems with binary mount data to explicitly set mount point
> * labeling information.
> */
> -int selinux_set_mnt_opts(struct super_block *sb, char **mount_options,
> - int *flags, int num_opts)
> +static int selinux_set_mnt_opts(struct super_block *sb, char **mount_options,
> + int *flags, int num_opts)
> {
> int rc = 0, i;
> struct task_security_struct *tsec = current->security;
>

--
James Morris
<[email protected]>