aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/inode.c10
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,
571 return err; 571 return err;
572} 572}
573 573
574static int gfs2_security_init(struct gfs2_inode *dip, struct gfs2_inode *ip,
575 const struct qstr *qstr)
576{
577 return security_inode_init_security(&ip->i_inode, &dip->i_inode, qstr,
578 &gfs2_initxattrs, NULL);
579}
580
581/** 574/**
582 * gfs2_create_inode - Create a new inode 575 * gfs2_create_inode - Create a new inode
583 * @dir: The parent directory 576 * @dir: The parent directory
@@ -758,7 +751,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
758 if (error) 751 if (error)
759 goto fail_gunlock3; 752 goto fail_gunlock3;
760 753
761 error = gfs2_security_init(dip, ip, name); 754 error = security_inode_init_security(&ip->i_inode, &dip->i_inode, name,
755 &gfs2_initxattrs, NULL);
762 if (error) 756 if (error)
763 goto fail_gunlock3; 757 goto fail_gunlock3;
764 758