From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 19 Mar 2014 15:21:41 +0000
Subject: [Cluster-devel] [GFS2 PATCH] GFS2: Remove extraneous function
 gfs2_security_init
In-Reply-To: <3657907.2015659.1395236220720.JavaMail.zimbra@redhat.com>
References: <3657907.2015659.1395236220720.JavaMail.zimbra@redhat.com>
Message-ID: <1395242501.2749.10.camel@menhir>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Hi,

Both patches now in the -nmw tree. Thanks,

Steve.

On Wed, 2014-03-19 at 09:37 -0400, Bob Peterson wrote:
> Hi,
> 
> This patch eliminates function gfs2_security_init in favor of just
> calling security_inode_init_security directly.
> 
> Regards,
> 
> Bob Peterson
> Red Hat File Systems
> 
> Signed-off-by: Bob Peterson <rpeterso@redhat.com> 
> ---
> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
> index ec455b9..e790949 100644
> --- a/fs/gfs2/inode.c
> +++ b/fs/gfs2/inode.c
> @@ -571,13 +571,6 @@ static int gfs2_initxattrs(struct inode *inode, const struct xattr *xattr_array,
>  	return err;
>  }
>  
> -static int gfs2_security_init(struct gfs2_inode *dip, struct gfs2_inode *ip,
> -			      const struct qstr *qstr)
> -{
> -	return security_inode_init_security(&ip->i_inode, &dip->i_inode, qstr,
> -					    &gfs2_initxattrs, NULL);
> -}
> -
>  /**
>   * gfs2_create_inode - Create a new inode
>   * @dir: The parent directory
> @@ -758,7 +751,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
>  	if (error)
>  		goto fail_gunlock3;
>  
> -	error = gfs2_security_init(dip, ip, name);
> +	error = security_inode_init_security(&ip->i_inode, &dip->i_inode, name,
> +					     &gfs2_initxattrs, NULL);
>  	if (error)
>  		goto fail_gunlock3;
>  
>