Skip to contentSkip to conversation

GFS2: Remove extraneous function gfs2_security_init

PATCH New Bob Peterson 2 participants 2 messages Mar 19, 2014 1 message not in the archive GFS2 file system

lore
Share & tools
lore
#1 lore raw

PATCH 1/1 GFS2: Remove extraneous function gfs2_security_init

In reply to a message not in the archive

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

---

fs/gfs2/inode.c +2 -8
index ec455b9..e790949 100644
@@ -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;
 
#2 lore raw

PATCH 1/1 GFS2: Remove extraneous function gfs2_security_init

Hi,

Both patches now in the -nmw tree. Thanks,

Steve.

Quoted 41 lines · Bob Peterson

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

---

fs/gfs2/inode.c +2 -8
index ec455b9..e790949 100644
@@ -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;