Module Name: src
Committed By: mlelstv
Date: Sat Mar 6 11:31:40 UTC 2010
Modified Files:
src/sbin/fsck_ffs: wapbl.c
Log Message:
When clearing a log on failure, not only ask the kernel to ignore an
existing log but to remove it on next mount.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sbin/fsck_ffs/wapbl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/wapbl.c
diff -u src/sbin/fsck_ffs/wapbl.c:1.4 src/sbin/fsck_ffs/wapbl.c:1.5
--- src/sbin/fsck_ffs/wapbl.c:1.4 Sun Sep 13 14:25:28 2009
+++ src/sbin/fsck_ffs/wapbl.c Sat Mar 6 11:31:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wapbl.c,v 1.4 2009/09/13 14:25:28 bouyer Exp $ */
+/* $NetBSD: wapbl.c,v 1.5 2010/03/06 11:31:40 mlelstv Exp $ */
/*-
* Copyright (c) 2005,2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define WAPBL_INTERNAL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wapbl.c,v 1.4 2009/09/13 14:25:28 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wapbl.c,v 1.5 2010/03/06 11:31:40 mlelstv Exp $");
#include <sys/stat.h>
#include <sys/time.h>
@@ -170,6 +170,7 @@
}
pwarn("CLEARING EXISTING JOURNAL\n");
sblock->fs_flags &= ~FS_DOWAPBL;
+ sblock->fs_journal_flags = UFS_WAPBL_FLAGS_CLEAR_LOG;
sbdirty();
ret = FSCK_EXIT_CHECK_FAILED;
} else {
@@ -198,6 +199,7 @@
}
pwarn("CLEARING EXISTING JOURNAL\n");
sblock->fs_flags &= ~FS_DOWAPBL;
+ sblock->fs_journal_flags = UFS_WAPBL_FLAGS_CLEAR_LOG;
sblock->fs_journal_location =
UFS_WAPBL_JOURNALLOC_NONE;
sbdirty();
@@ -215,6 +217,7 @@
}
pwarn("CLEARING EXISTING JOURNAL\n");
sblock->fs_flags &= ~FS_DOWAPBL;
+ sblock->fs_journal_flags = UFS_WAPBL_FLAGS_CLEAR_LOG;
sbdirty();
ret = FSCK_EXIT_CHECK_FAILED;
}
