This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch master in repository gfs2-utils.
commit 4e718620ea5a98386349cd7a9a8e9f3deaf1510e Author: Andrew Price anprice@redhat.com AuthorDate: Mon Mar 22 11:37:46 2021 +0000
gfs2_convert: Remove fd parameter from gfs1_ri_update
It's only called with fd == 0 so use that instead.
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/convert/gfs2_convert.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index 839e29ba..e43c9aa4 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -1550,7 +1550,7 @@ static int sanity_check(struct gfs2_sbd *sdp) * * Returns: 0 on success, -1 on failure. */ -static int gfs1_ri_update(struct gfs2_sbd *sdp, int fd, int *rgcount, int quiet) +static int gfs1_ri_update(struct gfs2_sbd *sdp, int *rgcount, int quiet) { struct rgrp_tree *rgd; struct gfs2_rindex *ri; @@ -1560,7 +1560,7 @@ static int gfs1_ri_update(struct gfs2_sbd *sdp, int fd, int *rgcount, int quiet) struct osi_node *n, *next = NULL; int ok;
- if (rindex_read(sdp, fd, &count1, &ok)) + if (rindex_read(sdp, 0, &count1, &ok)) goto fail; for (n = osi_first(&sdp->rgtree); n; n = next) { next = osi_next(n); @@ -1715,7 +1715,7 @@ static int init(struct gfs2_sbd *sbp, struct gfs2_options *opts) sbp->md.riinode->i_di.di_mode &= ~S_IFMT; sbp->md.riinode->i_di.di_mode |= S_IFDIR; printf(_("Examining file system")); - if (gfs1_ri_update(sbp, 0, &rgcount, 0)){ + if (gfs1_ri_update(sbp, &rgcount, 0)){ log_crit(_("Unable to fill in resource group information.\n")); return -1; }