| Message ID | 1448919823-27103-3-git-send-email-agruenba@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 30 Nov 2015, Andreas Gruenbacher wrote: > Function gfs2_xattr_acl_chmod is unused since commit e01580bf. > > Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> > Cc: Steven Whitehouse <swhiteho@redhat.com> > Cc: Bob Peterson <rpeterso@redhat.com> > Cc: cluster-devel@redhat.com Reviewed-by: James Morris <james.l.morris@oracle.com>
----- Original Message ----- > Function gfs2_xattr_acl_chmod is unused since commit e01580bf. > > Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> > Cc: Steven Whitehouse <swhiteho@redhat.com> > Cc: Bob Peterson <rpeterso@redhat.com> > Cc: cluster-devel@redhat.com > --- > fs/gfs2/xattr.c | 50 -------------------------------------------------- > fs/gfs2/xattr.h | 1 - > 2 files changed, 51 deletions(-) > > diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c > index 53ce76a..84f2d81 100644 > --- a/fs/gfs2/xattr.c > +++ b/fs/gfs2/xattr.c > @@ -1237,56 +1237,6 @@ static int gfs2_xattr_set(const struct xattr_handler > *handler, > 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) > { > struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); > diff --git a/fs/gfs2/xattr.h b/fs/gfs2/xattr.h > index d392f83..2d887c8 100644 > --- a/fs/gfs2/xattr.h > +++ b/fs/gfs2/xattr.h > @@ -62,6 +62,5 @@ extern int gfs2_ea_dealloc(struct gfs2_inode *ip); > /* Exported to acl.c */ > > 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__ */ > -- > 2.5.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > Hi, Acked-by: Bob Peterson <rpeterso@redhat.com> Regards, Bob Peterson Red Hat File Systems -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c index 53ce76a..84f2d81 100644 --- a/fs/gfs2/xattr.c +++ b/fs/gfs2/xattr.c @@ -1237,56 +1237,6 @@ static int gfs2_xattr_set(const struct xattr_handler *handler, 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) { struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); diff --git a/fs/gfs2/xattr.h b/fs/gfs2/xattr.h index d392f83..2d887c8 100644 --- a/fs/gfs2/xattr.h +++ b/fs/gfs2/xattr.h @@ -62,6 +62,5 @@ extern int gfs2_ea_dealloc(struct gfs2_inode *ip); /* Exported to acl.c */ 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__ */
Function gfs2_xattr_acl_chmod is unused since commit e01580bf. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> Cc: Steven Whitehouse <swhiteho@redhat.com> Cc: Bob Peterson <rpeterso@redhat.com> Cc: cluster-devel@redhat.com --- fs/gfs2/xattr.c | 50 -------------------------------------------------- fs/gfs2/xattr.h | 1 - 2 files changed, 51 deletions(-)