[gfs2-utils] branch main updated: Remove sd_bsize assignments which have no effect

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch main
in repository gfs2-utils.

The following commit(s) were added to refs/heads/main by this push:
     new c464d202 Remove sd_bsize assignments which have no effect
c464d202 is described below

commit c464d202cbbb266601edabe2920beaa95b58d2f0
Author: Andrew Price <anprice(a)redhat.com&gt;
AuthorDate: Wed Aug 3 17:13:44 2022 +0100

    Remove sd_bsize assignments which have no effect
    
    These were introduced by mechanical changes in commit 414db3ab0, e.g.
    
    -       sbp->bsize = sbp->sd_sb.sb_bsize;
    +       sbp->sd_bsize = sbp->sd_bsize;
    
    Signed-off-by: Andrew Price <anprice(a)redhat.com&gt;
---
 gfs2/convert/gfs2_convert.c | 1 -
 gfs2/edit/savemeta.c        | 3 ---
 gfs2/mkfs/main_grow.c       | 1 -
 3 files changed, 5 deletions(-)

diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index 3455ad1c..0b8f3d92 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -1597,7 +1597,6 @@ static int init(struct lgfs2_sbd *sbp, struct gfs2_options *opts)
 	jindex_addr = be64_to_cpu(gfs1_sb.sb_jindex_di.no_addr);
 	rindex_addr = be64_to_cpu(gfs1_sb.sb_rindex_di.no_addr);
 
-	sbp->sd_bsize = sbp->sd_bsize;
 	sbp->fssize = lseek(sbp->device_fd, 0, SEEK_END) / sbp->sd_bsize;
 	sbp->sd_inptrs = (sbp->sd_bsize - sizeof(struct gfs_indirect)) /
 		sizeof(uint64_t);
diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
index 05c3f295..e1862596 100644
--- a/gfs2/edit/savemeta.c
+++ b/gfs2/edit/savemeta.c
@@ -1129,8 +1129,6 @@ void savemeta(char *out_fn, int saveoption, int gziplevel)
 	mfd = savemetaopen(out_fn, gziplevel);
 
 	blks_saved = 0;
-	if (sbd.gfs1)
-		sbd.sd_bsize = sbd.sd_bsize;
 	printf("There are %"PRIu64" blocks of %u bytes in the
filesystem.\n",
 	       sbd.fssize, sbd.sd_bsize);
 
@@ -1261,7 +1259,6 @@ static int restore_super(struct metafd *mfd, void *buf, int
printonly)
 	}
 	if (ret == 1)
 		sbd.gfs1 = 1;
-	sbd.sd_bsize = sbd.sd_bsize;
 	if ((!printonly) && lgfs2_sb_write(&sbd, sbd.device_fd)) {
 		fprintf(stderr, "Failed to write superblock\n");
 		return -1;
diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c
index 66081a2e..6f51e126 100644
--- a/gfs2/mkfs/main_grow.c
+++ b/gfs2/mkfs/main_grow.c
@@ -393,7 +393,6 @@ int main(int argc, char *argv[])
 			exit(EXIT_FAILURE);
 		}
 		sdp->sd_bsize = LGFS2_DEFAULT_BSIZE;
-		sdp->sd_bsize = sdp->sd_bsize;
 		if (lgfs2_compute_constants(sdp)) {
 			log_crit("%s\n", _("Failed to compute file system constants"));
 			exit(EXIT_FAILURE);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.