diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2014-03-19 09:37:00 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2014-03-19 15:16:58 +0000 |
| commit | f45dc26deda00d77ae96b11612c353fff7d93e09 (patch) | |
| tree | c93fcc6c942703dac7b8f8477bab1f714b601a3b /fs/gfs2 | |
| parent | b00263d1cafdd667de56cde47f35d5ee8dd37e14 (diff) | |
| download | blackbird-op-linux-f45dc26deda00d77ae96b11612c353fff7d93e09.tar.gz blackbird-op-linux-f45dc26deda00d77ae96b11612c353fff7d93e09.zip | |
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: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/inode.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index b52ebf8553c2..69ed57a980d0 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; |
