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 c354c64abe37e6e769ce566382c754c9eae4173c
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Mon Aug 1 09:31:12 2022 +0100
fsck.gfs2: Pass fsck_options into destroy()
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/fsck/fsck.h | 2 +-
gfs2/fsck/initialize.c | 4 ++--
gfs2/fsck/main.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gfs2/fsck/fsck.h b/gfs2/fsck/fsck.h
index 155f4d23..efcde8be 100644
--- a/gfs2/fsck/fsck.h
+++ b/gfs2/fsck/fsck.h
@@ -131,7 +131,7 @@ extern struct lgfs2_inode *fsck_inode_get(struct lgfs2_sbd *sdp,
extern void fsck_inode_put(struct lgfs2_inode **ip);
extern int initialize(struct fsck_cx *cx, const struct fsck_options * const opts, int
*all_clean);
-extern void destroy(struct fsck_cx *cx);
+extern void destroy(struct fsck_cx *cx, const struct fsck_options * const _opts);
extern int pass1(struct fsck_cx *cx);
extern int pass1b(struct fsck_cx *cx);
extern int pass1c(struct fsck_cx *cx);
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index 0342402a..165ff43f 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -1679,11 +1679,11 @@ mount_fail:
return FSCK_USAGE;
}
-void destroy(struct fsck_cx *cx)
+void destroy(struct fsck_cx *cx, const struct fsck_options * const _opts)
{
struct lgfs2_sbd *sdp = cx->sdp;
- if (!opts.no) {
+ if (!_opts->no) {
if (block_mounters(sdp, 0)) {
log_warn( _("Unable to unblock other mounters - manual intervention
required\n"));
log_warn( _("Use 'gfs2_tool sb <device> proto' to fix\n"));
diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c
index 86375bf4..9a74b365 100644
--- a/gfs2/fsck/main.c
+++ b/gfs2/fsck/main.c
@@ -330,7 +330,7 @@ int main(int argc, char **argv)
if (!opts.force && all_clean && opts.preen) {
log_err( _("%s: clean.\n"), opts.device);
- destroy(&cx);
+ destroy(&cx, &opts);
exit(FSCK_OK);
}
@@ -363,7 +363,7 @@ int main(int argc, char **argv)
fsync(sb.device_fd);
link1_destroy(&nlink1map);
link1_destroy(&clink1map);
- destroy(&cx);
+ destroy(&cx, &opts);
if (sb_fixed)
log_warn(_("Superblock was reset. Use tunegfs2 to manually "
"set lock table before mounting.\n"));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.