LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: John Johansen <john.johansen@canonical.com>
To: Colin King <colin.king@canonical.com>,
	James Morris <jmorris@namei.org>,
	"Serge E . Hallyn" <serge@hallyn.com>,
	linux-security-module@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] apparmor: clean an indentation issue, remove extraneous space
Date: Wed, 31 Oct 2018 02:13:21 -0700	[thread overview]
Message-ID: <578c025a-d656-4c15-e14b-4325211613bd@canonical.com> (raw)
In-Reply-To: <20181030141131.3258-1-colin.king@canonical.com>

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


      reply	other threads:[~2018-10-31  9:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-30 14:11 Colin King
2018-10-31  9:13 ` John Johansen [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=578c025a-d656-4c15-e14b-4325211613bd@canonical.com \
    --to=john.johansen@canonical.com \
    --cc=colin.king@canonical.com \
    --cc=jmorris@namei.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=serge@hallyn.com \
    --subject='Re: [PATCH] apparmor: clean an indentation issue, remove extraneous space' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).