* [PATCH] apparmor: clean an indentation issue, remove extraneous space
@ 2018-10-30 14:11 Colin King
2018-10-31 9:13 ` John Johansen
0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2018-10-30 14:11 UTC (permalink / raw)
To: John Johansen, James Morris, Serge E . Hallyn, linux-security-module
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Trivial fix to clean up an indentation issue, remove space
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
security/apparmor/apparmorfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 658b85639006..33f89b3f28a4 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1744,7 +1744,7 @@ static int ns_rmdir_op(struct inode *dir, struct dentry *dentry)
if (error)
return error;
- parent = aa_get_ns(dir->i_private);
+ parent = aa_get_ns(dir->i_private);
/* rmdir calls the generic securityfs functions to remove files
* from the apparmor dir. It is up to the apparmor ns locking
* to avoid races.
--
2.19.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] apparmor: clean an indentation issue, remove extraneous space
2018-10-30 14:11 [PATCH] apparmor: clean an indentation issue, remove extraneous space Colin King
@ 2018-10-31 9:13 ` John Johansen
0 siblings, 0 replies; 3+ messages in thread
From: John Johansen @ 2018-10-31 9:13 UTC (permalink / raw)
To: Colin King, James Morris, Serge E . Hallyn, linux-security-module
Cc: kernel-janitors, linux-kernel
On 10/30/18 7:11 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Trivial fix to clean up an indentation issue, remove space
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Thanks Colin,
I have pulled this into apparmor-next
> ---
> security/apparmor/apparmorfs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
> index 658b85639006..33f89b3f28a4 100644
> --- a/security/apparmor/apparmorfs.c
> +++ b/security/apparmor/apparmorfs.c
> @@ -1744,7 +1744,7 @@ static int ns_rmdir_op(struct inode *dir, struct dentry *dentry)
> if (error)
> return error;
>
> - parent = aa_get_ns(dir->i_private);
> + parent = aa_get_ns(dir->i_private);
> /* rmdir calls the generic securityfs functions to remove files
> * from the apparmor dir. It is up to the apparmor ns locking
> * to avoid races.
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] apparmor: clean an indentation issue, remove extraneous space
@ 2018-10-31 9:13 ` John Johansen
0 siblings, 0 replies; 3+ messages in thread
From: John Johansen @ 2018-10-31 9:13 UTC (permalink / raw)
To: Colin King, James Morris, Serge E . Hallyn, linux-security-module
Cc: kernel-janitors, linux-kernel
On 10/30/18 7:11 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Trivial fix to clean up an indentation issue, remove space
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Thanks Colin,
I have pulled this into apparmor-next
> ---
> security/apparmor/apparmorfs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
> index 658b85639006..33f89b3f28a4 100644
> --- a/security/apparmor/apparmorfs.c
> +++ b/security/apparmor/apparmorfs.c
> @@ -1744,7 +1744,7 @@ static int ns_rmdir_op(struct inode *dir, struct dentry *dentry)
> if (error)
> return error;
>
> - parent = aa_get_ns(dir->i_private);
> + parent = aa_get_ns(dir->i_private);
> /* rmdir calls the generic securityfs functions to remove files
> * from the apparmor dir. It is up to the apparmor ns locking
> * to avoid races.
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-31 9:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-30 14:11 [PATCH] apparmor: clean an indentation issue, remove extraneous space Colin King
2018-10-31 9:13 ` John Johansen
2018-10-31 9:13 ` John Johansen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.