Module Name: src
Committed By: bouyer
Date: Thu Feb 17 17:13:48 UTC 2011
Modified Files:
src/sbin/fsck_ffs [bouyer-quota2]: setup.c
Log Message:
Move quota2_check_doquota() call so that an unclean, wapbl filesystem
will still be ckecked if a quota inode needs to be created.
To generate a diff of this commit:
cvs rdiff -u -r1.90.2.1 -r1.90.2.2 src/sbin/fsck_ffs/setup.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/setup.c
diff -u src/sbin/fsck_ffs/setup.c:1.90.2.1 src/sbin/fsck_ffs/setup.c:1.90.2.2
--- src/sbin/fsck_ffs/setup.c:1.90.2.1 Thu Jan 20 14:24:54 2011
+++ src/sbin/fsck_ffs/setup.c Thu Feb 17 17:13:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.90.2.1 2011/01/20 14:24:54 bouyer Exp $ */
+/* $NetBSD: setup.c,v 1.90.2.2 2011/02/17 17:13:48 bouyer Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95";
#else
-__RCSID("$NetBSD: setup.c,v 1.90.2.1 2011/01/20 14:24:54 bouyer Exp $");
+__RCSID("$NetBSD: setup.c,v 1.90.2.2 2011/02/17 17:13:48 bouyer Exp $");
#endif
#endif /* not lint */
@@ -174,6 +174,10 @@
doskipclean = 0;
pwarn("USING ALTERNATE SUPERBLOCK AT %d\n", bflag);
}
+
+ if (!quota2_check_doquota())
+ doskipclean = 0;
+
/* ffs_superblock_layout() == 2 */
if (sblock->fs_magic != FS_UFS1_MAGIC ||
(sblock->fs_old_flags & FS_FLAGS_UPDATED) != 0) {
@@ -182,7 +186,7 @@
doskipclean = 0;
}
if (sblock->fs_flags & FS_DOWAPBL) {
- if (preen && skipclean) {
+ if (preen && doskipclean) {
if (!quiet)
pwarn("file system is journaled; "
"not checking\n");
@@ -210,9 +214,6 @@
if (doswap)
doskipclean = 0;
- if (!quota2_check_doquota())
- doskipclean = 0;
-
if (sblock->fs_clean & FS_ISCLEAN) {
if (doskipclean) {
if (!quiet)
