[gfs2-utils] 10/34: fsck.gfs2: Pass fsck_options into replay_journals()

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 76dade28bb0eca75108a69fcbc5108d0789be424
Author: Andrew Price 
AuthorDate: Mon Aug 1 09:15:51 2022 +0100

fsck.gfs2: Pass fsck_options into replay_journals()

Signed-off-by: Andrew Price 
---
 gfs2/fsck/fs_recovery.c | 12 +++++-------
 gfs2/fsck/fs_recovery.h |  3 +--
 gfs2/fsck/initialize.c  |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c
index 94de748c..cbf11325 100644
--- a/gfs2/fsck/fs_recovery.c
+++ b/gfs2/fsck/fs_recovery.c
@@ -675,8 +675,7 @@ static struct metawalk_fxns rangecheck_journal = {
  *
  * Returns: 0 on success, -1 on failure
  */
-int replay_journals(struct fsck_cx *cx, int preen, int force_check,
-		    int *clean_journals)
+int replay_journals(struct fsck_cx *cx, const struct fsck_options * const _opts, int *clean_journals)
 {
    struct lgfs2_sbd *sdp = cx->sdp;
    int dirty_journals = 0;
@@ -711,13 +710,12 @@ int replay_journals(struct fsck_cx *cx, int preen, int force_check,
    		if (sdp->jsize == LGFS2_DEFAULT_JSIZE && jsize &&
    		    jsize != sdp->jsize)
    			sdp->jsize = jsize;
-			error = recover_journal(sdp->md.journal[i], i,
-						     preen, force_check,
-						     &clean);
+			error = recover_journal(sdp->md.journal[i], i, _opts->preen,
+			                        _opts->force, &clean);
    		if (!clean)
    			dirty_journals++;
-			if (!gave_msg && dirty_journals == 1 && !opts.no &&
-			    preen_is_safe(sdp, preen, force_check)) {
+			if (!gave_msg && dirty_journals == 1 && !_opts->no &&
+			    preen_is_safe(sdp, _opts->preen, _opts->force)) {
    			gave_msg = 1;
    			log_notice( _("Recovering journals (this may "
    				      "take a while)\n"));
diff --git a/gfs2/fsck/fs_recovery.h b/gfs2/fsck/fs_recovery.h
index 51d632ee..1b60c6a8 100644
--- a/gfs2/fsck/fs_recovery.h
+++ b/gfs2/fsck/fs_recovery.h
@@ -3,8 +3,7 @@

#include "libgfs2.h"

-extern int replay_journals(struct fsck_cx *cx, int preen, int force_check,
-			   int *clean_journals);
+extern int replay_journals(struct fsck_cx *cx, const struct fsck_options * const _opts, int *clean_journals);
 extern int preen_is_safe(struct lgfs2_sbd *sdp, int preen, int force_check);

extern int ji_update(struct lgfs2_sbd *sdp);
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index c5160acc..dca68c0a 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -1652,7 +1652,7 @@ int initialize(struct fsck_cx *cx, const struct fsck_options * const _opts, int
    	if (sdp->gfs1) {
    		if (reconstruct_journals(sdp))
    			return FSCK_ERROR;
-		} else if (replay_journals(cx, _opts->preen, _opts->force, &clean_journals)) {
+		} else if (replay_journals(cx, _opts, &clean_journals)) {
    		if (!opts.no && preen_is_safe(sdp, _opts->preen, _opts->force))
    			block_mounters(sdp, 0);
    		stack;