2018-10-30 14:12:49

by Colin King

Subject: [PATCH] apparmor: clean an indentation issue, remove extraneous space

From: Colin Ian King <[email protected]>

Trivial fix to clean up an indentation issue, remove space

Signed-off-by: Colin Ian King <[email protected]>
---
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

2018-10-31 09:15:55

by John Johansen

Subject: Re: [PATCH] apparmor: clean an indentation issue, remove extraneous space

On 10/30/18 7:11 AM, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Trivial fix to clean up an indentation issue, remove space
>
> Signed-off-by: Colin Ian King <[email protected]>

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.
>