forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GFS2: Remove extraneous function gfs2_security_init

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

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Bob Peterson 2014-03-19 09:37:00 -04:00 • committed by Steven Whitehouse
commit f45dc26ded
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fs/gfs2/inode.c
View file

@ -571,13 +571,6 @@ static int gfs2_initxattrs(struct inode *inode, const struct xattr *xattr_array,
return err; 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 * gfs2_create_inode - Create a new inode
* @dir: The parent directory * @dir: The parent directory
@ -758,7 +751,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
if (error) if (error)
goto fail_gunlock3; 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) if (error)
goto fail_gunlock3; goto fail_gunlock3;