Commit f45dc26d authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

GFS2: Remove extraneous function gfs2_security_init 



This patch eliminates function gfs2_security_init in favor of just
calling security_inode_init_security directly.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent b00263d1

fs/gfs2/inode.c

+2 −8
Original line number Diff line number Diff line
@@ -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;