Gitweb:
http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=d7154963...
Commit: d7154963adc558244b67e9c7bd449ae6ff94e367
Parent: 65d7c65f12cf4e6e551af516ba3e5e51fd51a0c8
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Fri Oct 10 16:23:27 2014 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Wed Apr 1 16:51:34 2015 +0100
libgfs2: Remove orig_journals from struct gfs2_sbd
The last remaining user of this field is easily changed to use its own
orig_journals variable instead.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/convert/gfs2_convert.c | 5 +++--
gfs2/libgfs2/libgfs2.h | 2 --
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index 8b86663..c0980bc 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -114,6 +114,7 @@ uint32_t gfs2_max_height;
uint32_t gfs2_max_jheight;
uint64_t jindex_addr = 0, rindex_addr = 0;
int print_level = MSG_NOTICE;
+unsigned orig_journals = 0;
/* ------------------------------------------------------------------------- */
/* This function is for libgfs's sake. */
@@ -1513,7 +1514,7 @@ static int read_gfs1_jiindex(struct gfs2_sbd *sdp)
log_crit(_("journal inode size invalid\n"));
goto fail;
}
- sdp->md.journals = sdp->orig_journals = j;
+ sdp->md.journals = orig_journals = j;
return 0;
fail:
@@ -1821,7 +1822,7 @@ static int journ_space_to_rg(struct gfs2_sbd *sdp)
mh.mh_format = GFS2_FORMAT_RB;
log_notice(_("Converting journal space to rg space.\n"));
/* Go through each journal, converting them one by one */
- for (j = 0; j < sdp->orig_journals; j++) { /* for each journal */
+ for (j = 0; j < orig_journals; j++) { /* for each journal */
uint64_t size;
jndx = &sd_jindex[j];
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 9ea7eb9..45ec8b1 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -321,8 +321,6 @@ struct gfs2_sbd {
struct osi_root rgtree;
struct osi_root rgcalc;
- unsigned int orig_journals;
-
struct gfs2_inode *master_dir;
struct master_dir md;