Module Name: src
Committed By: martin
Date: Thu Feb 15 08:26:37 UTC 2018
Modified Files:
src/sbin/fsck_ffs [netbsd-8]: pass1.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #550):
sbin/fsck_ffs/pass1.c: revision 1.58
Treat an inode with "mode == 0" and "blocks != 0" as partially allocated
and clear it as ffs_newvnode() tests for "blocks == 0".
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.57.4.1 src/sbin/fsck_ffs/pass1.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/pass1.c
diff -u src/sbin/fsck_ffs/pass1.c:1.57 src/sbin/fsck_ffs/pass1.c:1.57.4.1
--- src/sbin/fsck_ffs/pass1.c:1.57 Wed Feb 8 16:11:40 2017
+++ src/sbin/fsck_ffs/pass1.c Thu Feb 15 08:26:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.57 2017/02/08 16:11:40 rin Exp $ */
+/* $NetBSD: pass1.c,v 1.57.4.1 2018/02/15 08:26:37 martin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: pass1.c,v 1.57 2017/02/08 16:11:40 rin Exp $");
+__RCSID("$NetBSD: pass1.c,v 1.57.4.1 2018/02/15 08:26:37 martin Exp $");
#endif
#endif /* not lint */
@@ -253,8 +253,9 @@ checkinode(ino_t inumber, struct inodesc
(memcmp(dp->dp1.di_db, ufs1_zino.di_db,
UFS_NDADDR * sizeof(int32_t)) ||
memcmp(dp->dp1.di_ib, ufs1_zino.di_ib,
- UFS_NIADDR * sizeof(int32_t)))) ||
- mode || size) {
+ UFS_NIADDR * sizeof(int32_t))))
+ ||
+ mode || size || DIP(dp, blocks)) {
pfatal("PARTIALLY ALLOCATED INODE I=%llu",
(unsigned long long)inumber);
if (reply("CLEAR") == 1) {
