[src/trunk]: src/sbin/fsck_ffs When clearing a log on failure, not only ask t...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c8fe75f0bd90
branches:  trunk
changeset: 752769:c8fe75f0bd90
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sat Mar 06 11:31:40 2010 +0000

description:
When clearing a log on failure, not only ask the kernel to ignore an
existing log but to remove it on next mount.

diffstat:

 sbin/fsck_ffs/wapbl.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r 68c98b2959d8 -r c8fe75f0bd90 sbin/fsck_ffs/wapbl.c
--- a/sbin/fsck_ffs/wapbl.c     Sat Mar 06 08:08:29 2010 +0000
+++ b/sbin/fsck_ffs/wapbl.c     Sat Mar 06 11:31:40 2010 +0000
@@ -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;
                                }