This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch master in repository gfs2-utils.
The following commit(s) were added to refs/heads/master by this push: new c0ea1bc4 libgfs2: Remove new_rgrps from struct gfs2_sbd c0ea1bc4 is described below
commit c0ea1bc41123b44f9211cacf3d3f7f4e7e79d387 Author: Andrew Price anprice@redhat.com AuthorDate: Fri Nov 12 16:20:58 2021 +0000
libgfs2: Remove new_rgrps from struct gfs2_sbd
This field hasn't been used outside of compute_rgrp_layout() since 2014.
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/fsck/rgrepair.c | 7 +++---- gfs2/libgfs2/libgfs2.h | 1 - 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c index 6698b29c..129e3e5c 100644 --- a/gfs2/fsck/rgrepair.c +++ b/gfs2/fsck/rgrepair.c @@ -758,7 +758,6 @@ static void compute_rgrp_layout(struct gfs2_sbd *sdp, struct osi_root *rgtree, i unsigned int rgrp = 0, nrgrp, rglength; uint64_t rgaddr;
- sdp->new_rgrps = 0; dev = &sdp->device;
/* If this is a new file system, compute the length and number */ @@ -768,9 +767,9 @@ static void compute_rgrp_layout(struct gfs2_sbd *sdp, struct osi_root *rgtree, i dev->length -= LGFS2_SB_ADDR(sdp) + 1; nrgrp = how_many_rgrps(sdp, dev, rgsize_specified); rglength = dev->length / nrgrp; - sdp->new_rgrps = nrgrp; } else { uint64_t old_length, new_chunk; + unsigned new_rgrps;
printf("Existing resource groups:\n"); for (rgrp = 0, n = osi_first(rgtree); n; n = next, rgrp++) { @@ -788,8 +787,8 @@ static void compute_rgrp_layout(struct gfs2_sbd *sdp, struct osi_root *rgtree, i rlast->length = rglength; old_length = rlast->rt_addr + rglength; new_chunk = dev->length - old_length; - sdp->new_rgrps = new_chunk / rglength; - nrgrp = rgrp + sdp->new_rgrps; + new_rgrps = new_chunk / rglength; + nrgrp = rgrp + new_rgrps; }
if (rgrp < nrgrp) diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 2b816f3c..dd97441f 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -376,7 +376,6 @@ struct gfs2_sbd {
uint64_t orig_rgrps; uint64_t rgrps; - uint64_t new_rgrps; struct osi_root rgtree; struct osi_root rgcalc;
cluster-commits@lists.fedorahosted.org