This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch andyp-sparse
in repository gfs2-utils.
commit 5fe42ca0139ecde28bee22db9382485b2a0fd23d
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Wed Apr 21 18:08:45 2021 +0100
libgfs2: Remove gfs2_quota_change_{in,out}
Just one remaining user of these functions so update it to avoid storing
cpu-endian data in an on-disk struct and remove the functions. Replace
the gfs2_quota_change_print() function as before.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/edit/gfs2hex.c | 4 +---
gfs2/libgfs2/libgfs2.h | 4 +---
gfs2/libgfs2/ondisk.c | 28 +++++-----------------------
3 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c
index dc748c52..b1fc1433 100644
--- a/gfs2/edit/gfs2hex.c
+++ b/gfs2/edit/gfs2hex.c
@@ -455,7 +455,6 @@ int display_gfs2(char *buf)
struct gfs2_leaf lf;
struct gfs_log_header lh1;
struct gfs2_log_header lh;
- struct gfs2_quota_change qc;
uint32_t magic;
@@ -538,8 +537,7 @@ int display_gfs2(char *buf)
break;
case GFS2_METATYPE_QC:
- gfs2_quota_change_in(&qc, buf);
- gfs2_quota_change_print(&qc);
+ lgfs2_quota_change_print(buf);
break;
default:
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 7ef9fcc7..d479ade2 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -718,8 +718,6 @@ extern void gfs2_log_header_in(struct gfs2_log_header *lh, char
*buf);
extern void gfs2_log_header_out(struct gfs2_log_header *lh, char *buf);
extern void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, char *buf);
extern void gfs2_statfs_change_out(struct gfs2_statfs_change *sc, char *buf);
-extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf);
-extern void gfs2_quota_change_out(struct gfs2_quota_change *qc, char *buf);
/* Printing functions */
@@ -734,10 +732,10 @@ extern void gfs2_leaf_print(const struct gfs2_leaf *lf);
extern void gfs2_ea_header_print(const struct gfs2_ea_header *ea, char *name);
extern void gfs2_log_header_print(const struct gfs2_log_header *lh);
extern void gfs2_statfs_change_print(const struct gfs2_statfs_change *sc);
-extern void gfs2_quota_change_print(const struct gfs2_quota_change *qc);
/* These expect on-disk data instead of native-endian structs */
extern void lgfs2_meta_header_print(void *mhp);
extern void lgfs2_log_descriptor_print(void *ldp);
+extern void lgfs2_quota_change_print(void *qcp);
__END_DECLS
diff --git a/gfs2/libgfs2/ondisk.c b/gfs2/libgfs2/ondisk.c
index c1602766..3b72051a 100644
--- a/gfs2/libgfs2/ondisk.c
+++ b/gfs2/libgfs2/ondisk.c
@@ -594,30 +594,12 @@ void gfs2_statfs_change_print(const struct gfs2_statfs_change *sc)
pv(sc, sc_dinodes, "%"PRId64, "0x%"PRIx64);
}
-void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf)
+void lgfs2_quota_change_print(void *qcp)
{
- struct gfs2_quota_change *str = (struct gfs2_quota_change *)(buf +
- sizeof(struct gfs2_meta_header));
+ struct gfs2_quota_change *qc = qcp;
- CPIN_64(qc, str, qc_change);
- CPIN_32(qc, str, qc_flags);
- CPIN_32(qc, str, qc_id);
-}
-
-void gfs2_quota_change_out(struct gfs2_quota_change *qc, char *buf)
-{
- struct gfs2_quota_change *str = (struct gfs2_quota_change *)(buf +
- sizeof(struct gfs2_meta_header));
-
- CPOUT_64(qc, str, qc_change);
- CPOUT_32(qc, str, qc_flags);
- CPOUT_32(qc, str, qc_id);
-}
-
-void gfs2_quota_change_print(const struct gfs2_quota_change *qc)
-{
- pv(qc, qc_change, "%"PRId64, "0x%"PRIx64);
- pv(qc, qc_flags, "0x%.8"PRIX32, NULL);
- pv(qc, qc_id, "%"PRIu32, "0x%"PRIx32);
+ print_it(" qc_change", "%"PRId64, "0x%"PRIx64,
be64_to_cpu(qc->qc_change));
+ print_it(" qc_flags", "0x%.8"PRIX32, NULL,
be32_to_cpu(qc->qc_flags));
+ printbe32(qc, qc_id);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.