This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch main in repository gfs2-utils.
commit 72229a2c4139dd6223bda492f8091e2452a916d7 Author: Andrew Price anprice@redhat.com AuthorDate: Wed Jan 12 14:09:31 2022 +0000
libgfs2: Return the inode from build_inum_range()
This allows the caller to call inode_put() when it's convenient and also allows the debug message printing to be moved out of the function. fsck.gfs2 passes the function by reference so it needs a shim until the other builder functions can be given the same signature.
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/convert/gfs2_convert.c | 10 +++++++--- gfs2/fsck/pass1.c | 10 +++++++--- gfs2/fsck/pass2.c | 12 +++++++++++- gfs2/libgfs2/libgfs2.h | 2 +- gfs2/libgfs2/structures.c | 16 +++++----------- gfs2/mkfs/main_mkfs.c | 14 +++++++++++--- 6 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index 9a326e7f..dd809e48 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -2112,12 +2112,16 @@ static int build_per_node(struct gfs2_sbd *sdp) return -1; } for (j = 0; j < sdp->md.journals; j++) { - err = build_inum_range(per_node, j); - if (err) { + struct gfs2_inode *ip; + + ip = build_inum_range(per_node, j); + if (ip == NULL) { log_crit(_("Error building '%s': %s\n"), "inum_range", strerror(errno)); - return err; + return 1; } + inode_put(&ip); + err = build_statfs_change(per_node, j); if (err) { log_crit(_("Error building '%s': %s\n"), "statfs_change", diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c index 38da46a6..8f576fe2 100644 --- a/gfs2/fsck/pass1.c +++ b/gfs2/fsck/pass1.c @@ -1590,12 +1590,16 @@ int build_per_node(struct gfs2_sbd *sdp) return -1; } for (j = 0; j < sdp->md.journals; j++) { - err = build_inum_range(per_node, j); - if (err) { + struct gfs2_inode *ip; + + ip = build_inum_range(per_node, j); + if (ip == NULL) { log_err(_("Error building '%s': %s\n"), "inum_range", strerror(errno)); - return err; + return 1; } + inode_put(&ip); + err = build_statfs_change(per_node, j); if (err) { log_err(_("Error building '%s': %s\n"), "statfs_change", diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c index 0ab35b55..229667fb 100644 --- a/gfs2/fsck/pass2.c +++ b/gfs2/fsck/pass2.c @@ -1875,6 +1875,16 @@ build_it: goto out_good; }
+static int fsck_build_inum_range(struct gfs2_inode *per_node, unsigned int n) +{ + struct gfs2_inode *ip = build_inum_range(per_node, n); + + if (ip == NULL) + return 1; + inode_put(&ip); + return 0; +} + /* Check system directory inode */ /* Should work for all system directories: root, master, jindex, per_node */ static int check_system_dir(struct gfs2_inode *sysinode, const char *dirname, @@ -1959,7 +1969,7 @@ static int check_system_dir(struct gfs2_inode *sysinode, const char *dirname, for (j = 0; j < sysinode->i_sbd->md.journals; j++) { sprintf(fn, "inum_range%d", j); error += check_pernode_for(j, sysinode, fn, 16, 0, - NULL, build_inum_range); + NULL, fsck_build_inum_range); sprintf(fn, "statfs_change%d", j); error += check_pernode_for(j, sysinode, fn, 24, 0, NULL, build_statfs_change); diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 863b84e6..e9c51054 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -787,7 +787,7 @@ extern int do_init_statfs(struct gfs2_sbd *sdp); extern int gfs2_check_meta(const char *buf, int type); extern unsigned lgfs2_bm_scan(struct rgrp_tree *rgd, unsigned idx, uint64_t *buf, uint8_t state); -extern int build_inum_range(struct gfs2_inode *per_node, unsigned int j); +extern struct gfs2_inode *build_inum_range(struct gfs2_inode *per_node, unsigned int n); extern int build_statfs_change(struct gfs2_inode *per_node, unsigned int j); extern int build_quota_change(struct gfs2_inode *per_node, unsigned int j);
diff --git a/gfs2/libgfs2/structures.c b/gfs2/libgfs2/structures.c index c9c31dd2..96a62475 100644 --- a/gfs2/libgfs2/structures.c +++ b/gfs2/libgfs2/structures.c @@ -279,7 +279,7 @@ struct gfs2_inode *lgfs2_build_jindex(struct gfs2_inode *master, struct lgfs2_in return jindex; }
-int build_inum_range(struct gfs2_inode *per_node, unsigned int j) +struct gfs2_inode *build_inum_range(struct gfs2_inode *per_node, unsigned int j) { char name[256]; struct gfs2_inode *ip; @@ -287,19 +287,13 @@ int build_inum_range(struct gfs2_inode *per_node, unsigned int j) sprintf(name, "inum_range%u", j); ip = createi(per_node, name, S_IFREG | 0600, GFS2_DIF_SYSTEM | GFS2_DIF_JDATA); - if (ip == NULL) { - return errno; - } + if (ip == NULL) + return NULL; + ip->i_size = sizeof(struct gfs2_inum_range); lgfs2_dinode_out(ip, ip->i_bh->b_data); bmodified(ip->i_bh); - if (cfg_debug) { - printf("\nInum Range %u:\n", j); - lgfs2_dinode_print(ip->i_bh->b_data); - } - - inode_put(&ip); - return 0; + return ip; }
int build_statfs_change(struct gfs2_inode *per_node, unsigned int j) diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 9c9c3752..ea4a653f 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -694,12 +694,20 @@ static int build_per_node(struct gfs2_sbd *sdp, struct mkfs_opts *opts) return -1; } for (j = 0; j < sdp->md.journals; j++) { - err = build_inum_range(per_node, j); - if (err) { + struct gfs2_inode *ip; + + ip = build_inum_range(per_node, j); + if (ip == NULL) { fprintf(stderr, _("Error building '%s': %s\n"), "inum_range", strerror(errno)); - return err; + return 1; + } + if (opts->debug) { + printf("\nInum Range %u:\n", j); + lgfs2_dinode_print(ip->i_bh->b_data); } + inode_put(&ip); + err = build_statfs_change(per_node, j); if (err) { fprintf(stderr, _("Error building '%s': %s\n"), "statfs_change",