[src/netbsd-8]: src/sbin/fsck_ffs Pull up following revision(s) (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/fb1071fd1f88
branches:  netbsd-8
changeset: 434638:fb1071fd1f88
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Feb 15 08:26:37 2018 +0000

description:
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".

diffstat:

 sbin/fsck_ffs/pass1.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r d87500496654 -r fb1071fd1f88 sbin/fsck_ffs/pass1.c
--- a/sbin/fsck_ffs/pass1.c     Thu Feb 15 07:59:23 2018 +0000
+++ b/sbin/fsck_ffs/pass1.c     Thu Feb 15 08:26:37 2018 +0000
@@ -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 @@
                    (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) {