This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch master in repository gfs2-utils.
commit ae74ab515bc0b97dd7fde4ad1f9f898d87b1a2ba Author: Andrew Price anprice@redhat.com AuthorDate: Mon Mar 22 16:47:14 2021 +0000
libgfs2: Replace lgfs2_rgrps_root() with lgfs2_attach_rgrps()
We only use this function to attach an rgrp tree to the sbd in order to call functions that (for now) expect it to be attached, so provide a more opaque function to do that.
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/libgfs2/libgfs2.h | 2 +- gfs2/libgfs2/rgrp.c | 4 ++-- gfs2/mkfs/main_mkfs.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 79206967..224d9884 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -209,7 +209,7 @@ extern lgfs2_rgrp_t lgfs2_rgrp_last(lgfs2_rgrps_t rgs); extern lgfs2_rgrp_t lgfs2_rgrp_next(lgfs2_rgrp_t rg); extern lgfs2_rgrp_t lgfs2_rgrp_prev(lgfs2_rgrp_t rg); // Temporary function to aid API migration -extern struct osi_node *lgfs2_rgrps_root(lgfs2_rgrps_t rgs) __attribute__((deprecated)); +extern void lgfs2_attach_rgrps(struct gfs2_sbd *sdp, lgfs2_rgrps_t rgs);
struct gfs2_buffer_head { osi_list_t b_altlist; /* alternate list */ diff --git a/gfs2/libgfs2/rgrp.c b/gfs2/libgfs2/rgrp.c index 86e77e18..75fd0ba3 100644 --- a/gfs2/libgfs2/rgrp.c +++ b/gfs2/libgfs2/rgrp.c @@ -630,9 +630,9 @@ unsigned lgfs2_rgsize_for_data(uint64_t blksreq, unsigned bsize) }
// Temporary function to aid in API migration -struct osi_node *lgfs2_rgrps_root(lgfs2_rgrps_t rgs) +void lgfs2_attach_rgrps(struct gfs2_sbd *sdp, lgfs2_rgrps_t rgs) { - return rgs->root.osi_node; + sdp->rgtree.osi_node = rgs->root.osi_node; }
/** diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 3722d64a..7d7e3730 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -1200,7 +1200,7 @@ int main(int argc, char *argv[]) fprintf(stderr, _("Failed to build resource groups\n")); exit(1); } - sbd.rgtree.osi_node = lgfs2_rgrps_root(rgs); // Temporary + lgfs2_attach_rgrps(&sbd, rgs); // Temporary
error = build_master(&sbd); if (error) {