Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44cb0d3f authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Al Viro
Browse files

gfs2: Remove gfs2_xattr_acl_chmod 



Function gfs2_xattr_acl_chmod is unused since commit e01580bf.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarJames Morris <james.l.morris@oracle.com>
Acked-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 80602324

fs/gfs2/xattr.c

+0 −50
Original line number Original line Diff line number Diff line
@@ -1237,56 +1237,6 @@ static int gfs2_xattr_set(const struct xattr_handler *handler, 
				size, flags, handler->flags);

				size, flags, handler->flags);

}

}







static int ea_acl_chmod_unstuffed(struct gfs2_inode *ip,

				  struct gfs2_ea_header *ea, char *data)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	unsigned int amount = GFS2_EA_DATA_LEN(ea);

	unsigned int nptrs = DIV_ROUND_UP(amount, sdp->sd_jbsize);

	int ret;



	ret = gfs2_trans_begin(sdp, nptrs + RES_DINODE, 0);

	if (ret)

		return ret;



	ret = gfs2_iter_unstuffed(ip, ea, data, NULL);

	gfs2_trans_end(sdp);



	return ret;

}



int gfs2_xattr_acl_chmod(struct gfs2_inode *ip, struct iattr *attr, char *data)

{

	struct inode *inode = &ip->i_inode;

	struct gfs2_sbd *sdp = GFS2_SB(inode);

	struct gfs2_ea_location el;

	int error;



	error = gfs2_ea_find(ip, GFS2_EATYPE_SYS, GFS2_POSIX_ACL_ACCESS, &el);

	if (error)

		return error;



	if (GFS2_EA_IS_STUFFED(el.el_ea)) {

		error = gfs2_trans_begin(sdp, RES_DINODE + RES_EATTR, 0);

		if (error == 0) {

			gfs2_trans_add_meta(ip->i_gl, el.el_bh);

			memcpy(GFS2_EA2DATA(el.el_ea), data,

			       GFS2_EA_DATA_LEN(el.el_ea));

		}

	} else {

		error = ea_acl_chmod_unstuffed(ip, el.el_ea, data);

	}



	brelse(el.el_bh);

	if (error)

		return error;



	error = gfs2_setattr_simple(inode, attr);

	gfs2_trans_end(sdp);

	return error;

}



static int ea_dealloc_indirect(struct gfs2_inode *ip)

static int ea_dealloc_indirect(struct gfs2_inode *ip)

{

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

fs/gfs2/xattr.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -62,6 +62,5 @@ extern int gfs2_ea_dealloc(struct gfs2_inode *ip); 
/* Exported to acl.c */

/* Exported to acl.c */





extern int gfs2_xattr_acl_get(struct gfs2_inode *ip, const char *name, char **data);

extern int gfs2_xattr_acl_get(struct gfs2_inode *ip, const char *name, char **data);

extern int gfs2_xattr_acl_chmod(struct gfs2_inode *ip, struct iattr *attr, char *data);





#endif /* __EATTR_DOT_H__ */
 
#endif /* __EATTR_DOT_H__ */