[gfs2-utils] 22/39: libgfs2: Remove some now-unused functions

This is an automated email from the git hooks/post-receive script. andyp pushed a commit to branch master in repository gfs2-utils. commit b293baa257e7912d4c943f3076f80e1da5a7fe43 Author: Andrew Price <anprice(a)redhat.com&gt; AuthorDate: Thu May 20 18:07:29 2021 +0100 libgfs2: Remove some now-unused functions Signed-off-by: Andrew Price <anprice(a)redhat.com&gt; --- gfs2/libgfs2/gfs1.c | 32 -------------------------------- gfs2/libgfs2/libgfs2.h | 8 +------- gfs2/libgfs2/ondisk.c | 13 ------------- 3 files changed, 1 insertion(+), 52 deletions(-) diff --git a/gfs2/libgfs2/gfs1.c b/gfs2/libgfs2/gfs1.c index 4cdf26e5..97fa32a5 100644 --- a/gfs2/libgfs2/gfs1.c +++ b/gfs2/libgfs2/gfs1.c @@ -320,22 +320,6 @@ void gfs_jindex_in(struct gfs_jindex *jindex, char *jbuf) memcpy(jindex->ji_reserved, str->ji_reserved, 64); } -void gfs_rgrp_in(struct gfs_rgrp *rgrp, const char *buf) -{ - struct gfs_rgrp *str = (struct gfs_rgrp *)buf; - - gfs2_meta_header_in(&rgrp->rg_header, buf); - rgrp->rg_flags = be32_to_cpu(str->rg_flags); - rgrp->rg_free = be32_to_cpu(str->rg_free); - rgrp->rg_useddi = be32_to_cpu(str->rg_useddi); - rgrp->rg_freedi = be32_to_cpu(str->rg_freedi); - gfs2_inum_in(&rgrp->rg_freedi_list, (char *)&str->rg_freedi_list); - rgrp->rg_usedmeta = be32_to_cpu(str->rg_usedmeta); - rgrp->rg_freemeta = be32_to_cpu(str->rg_freemeta); - - memcpy(rgrp->rg_reserved, str->rg_reserved, 64); -} - void lgfs2_gfs_rgrp_in(const lgfs2_rgrp_t rg, void *buf) { struct gfs_rgrp *r = buf; @@ -350,22 +334,6 @@ void lgfs2_gfs_rgrp_in(const lgfs2_rgrp_t rg, void *buf) rg->rt_freemeta = be32_to_cpu(r->rg_freemeta); } -void gfs_rgrp_out(const struct gfs_rgrp *rgrp, char *buf) -{ - struct gfs_rgrp *str = (struct gfs_rgrp *)buf; - - gfs2_meta_header_out(&rgrp->rg_header, buf); - str->rg_flags = cpu_to_be32(rgrp->rg_flags); - str->rg_free = cpu_to_be32(rgrp->rg_free); - str->rg_useddi = cpu_to_be32(rgrp->rg_useddi); - str->rg_freedi = cpu_to_be32(rgrp->rg_freedi); - gfs2_inum_out(&rgrp->rg_freedi_list, (char *)&str->rg_freedi_list); - str->rg_usedmeta = cpu_to_be32(rgrp->rg_usedmeta); - str->rg_freemeta = cpu_to_be32(rgrp->rg_freemeta); - - memcpy(str->rg_reserved, rgrp->rg_reserved, 64); -} - void lgfs2_gfs_rgrp_out(const lgfs2_rgrp_t rg, void *buf) { struct gfs_rgrp *r = buf; diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 09d25ae0..361f97e8 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -707,9 +707,7 @@ extern int gfs1_writei(struct gfs2_inode *ip, char *buf, uint64_t offset, extern struct gfs2_inode *lgfs2_gfs_inode_get(struct gfs2_sbd *sdp, char *buf); extern struct gfs2_inode *lgfs2_gfs_inode_read(struct gfs2_sbd *sdp, uint64_t di_addr); extern void gfs_jindex_in(struct gfs_jindex *jindex, char *buf); -extern void gfs_rgrp_in(struct gfs_rgrp *rg, const char *buf); extern void lgfs2_gfs_rgrp_in(const lgfs2_rgrp_t rg, void *buf); -extern void gfs_rgrp_out(const struct gfs_rgrp *rg, char *buf); extern void lgfs2_gfs_rgrp_out(const lgfs2_rgrp_t rg, void *buf); /* misc.c */ @@ -801,11 +799,7 @@ extern void gfs2_dirent_out(struct gfs2_dirent *de, char *buf); extern void gfs2_leaf_in(struct gfs2_leaf *lf, char *buf); extern void gfs2_leaf_out(struct gfs2_leaf *lf, char *buf); -/* Printing functions */ - -extern void gfs2_inum_print(const struct gfs2_inum *no); -extern void gfs2_meta_header_print(const struct gfs2_meta_header *mh); -/* These expect on-disk data instead of native-endian structs */ +/* Printing functions. These expect on-disk data */ extern void lgfs2_inum_print(void *nop); extern void lgfs2_meta_header_print(void *mhp); extern void lgfs2_sb_print(void *sbp); diff --git a/gfs2/libgfs2/ondisk.c b/gfs2/libgfs2/ondisk.c index f7d7553f..659f4038 100644 --- a/gfs2/libgfs2/ondisk.c +++ b/gfs2/libgfs2/ondisk.c @@ -67,12 +67,6 @@ void gfs2_inum_out(const struct gfs2_inum *no, char *buf) CPOUT_64(no, str, no_addr); } -void gfs2_inum_print(const struct gfs2_inum *no) -{ - pv(no, no_formal_ino, "%"PRIu64, "0x%"PRIx64); - pv(no, no_addr, "%"PRIu64, "0x%"PRIx64); -} - void lgfs2_inum_print(void *nop) { struct gfs2_inum *no = nop; @@ -101,13 +95,6 @@ void gfs2_meta_header_out(const struct gfs2_meta_header *mh, char *buf) str->__pad1 = 0; } -void gfs2_meta_header_print(const struct gfs2_meta_header *mh) -{ - pv(mh, mh_magic, "0x%08"PRIX32, NULL); - pv(mh, mh_type, "%"PRIu32, "0x%"PRIx32); - pv(mh, mh_format, "%"PRIu32, "0x%"PRIx32); -} - void lgfs2_meta_header_print(void *mhp) { struct gfs2_meta_header *mh = mhp; -- To stop receiving notification emails like this one, please contact the administrator of this repository.