This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch andyp-fsck_cx in repository gfs2-utils.
commit f33d1bb5233a2566efd39288dbcc597a63170c1e Author: Andrew Price anprice@redhat.com AuthorDate: Mon Aug 1 11:05:56 2022 +0100
fsck.gfs2: Pass fsck_cx into reconstruct_journals()
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/fsck/initialize.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c index c84bcb5c..6edab7f8 100644 --- a/gfs2/fsck/initialize.c +++ b/gfs2/fsck/initialize.c @@ -1489,10 +1489,11 @@ out: * * Returns: 0 on success, -1 on failure */ -static int reconstruct_journals(struct lgfs2_sbd *sdp) +static int reconstruct_journals(struct fsck_cx *cx) { int i, count; struct gfs_jindex *ji; + struct lgfs2_sbd *sdp = cx->sdp; char buf[sizeof(struct gfs_jindex)];
/* Ensure that sb_seg_size is valid */ @@ -1656,7 +1657,7 @@ int initialize(struct fsck_cx *cx, int *all_clean) have the smarts to replay GFS1 journals (neither did gfs_fsck). */ if (sdp->gfs1) { - if (reconstruct_journals(sdp)) + if (reconstruct_journals(cx)) return FSCK_ERROR; } else if (replay_journals(cx, &clean_journals)) { if (!cx->opts->no && preen_is_safe(sdp, cx->opts))