[src/netbsd-1-4]: src/sys/ufs/lfs Pull up revision 1.28 (requested by perseant):

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

details:   https://anonhg.NetBSD.org/src/rev/c25e62459116
branches:  netbsd-1-4
changeset: 470055:c25e62459116
user:      he <he%NetBSD.org@localhost>
date:      Sat Jan 15 17:52:33 2000 +0000

description:
Pull up revision 1.28 (requested by perseant):
  Address problems related to using an LFS filesystem as the root
  filesystem, including mknod hangs.  Fixes PR#8172 and PR#9072.

diffstat:

 sys/ufs/lfs/lfs_vnops.c |  60 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 8 deletions(-)

diffs (84 lines):

diff -r 3b9cd4324ec7 -r c25e62459116 sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Sat Jan 15 17:52:06 2000 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Sat Jan 15 17:52:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.25.2.4 1999/12/18 00:01:53 he Exp $    */
+/*     $NetBSD: lfs_vnops.c,v 1.25.2.5 2000/01/15 17:52:33 he Exp $    */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -197,7 +197,7 @@
        { &vop_vfree_desc, lfs_vfree },                 /* vfree */
        { &vop_truncate_desc, spec_truncate },          /* truncate */
        { &vop_update_desc, lfs_update },               /* update */
-       { &vop_bwrite_desc, lfs_bwrite },               /* bwrite */
+       { &vop_bwrite_desc, vn_bwrite },                /* bwrite */
        { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
 struct vnodeopv_desc lfs_specop_opv_desc =
@@ -379,15 +379,59 @@
                struct componentname *a_cnp;
                struct vattr *a_vap;
                } */ *ap = v;
-       int ret;
+        struct vattr *vap = ap->a_vap;
+        struct vnode **vpp = ap->a_vpp;
+        struct inode *ip;
+        int error;
 
-       if((ret=SET_DIROP(VTOI(ap->a_dvp)->i_lfs))!=0)
-               return ret;
+       if((error=SET_DIROP(VTOI(ap->a_dvp)->i_lfs))!=0)
+               return error;
        MARK_VNODE(ap->a_dvp);
-       ret = ufs_mknod(ap);
-       MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,*(ap->a_vpp)); /* XXX KS */
+       error = ufs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode),
+            ap->a_dvp, vpp, ap->a_cnp);
+
+       /* Either way we're done with the dirop at this point */
        SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,ap->a_dvp,"mknod");
-       return (ret);
+
+        if (error)
+               return (error);
+
+        ip = VTOI(*vpp);
+        ip->i_flag |= IN_ACCESS | IN_CHANGE | IN_UPDATE;
+        if (vap->va_rdev != VNOVAL) {
+                /*
+                 * Want to be able to use this to make badblock
+                 * inodes, so don't truncate the dev number.
+                 */
+#if 0
+                ip->i_ffs_rdev = ufs_rw32(vap->va_rdev,
+                    UFS_MPNEEDSWAP((*vpp)->v_mount));
+#else
+                ip->i_ffs_rdev = vap->va_rdev;
+#endif
+        }
+       /*
+        * Call fsync to write the vnode so that we don't have to deal with
+        * flushing it when it's marked VDIROP|VXLOCK.
+        *
+        * XXX KS - If we can't flush we also can't call vgone(), so must
+        * return.  But, that leaves this vnode in limbo, also not good.
+        * Can this ever happen (barring hardware failure)?
+        */
+       if ((error = VOP_FSYNC(*vpp, NOCRED, FSYNC_WAIT, curproc)) != 0)
+               return (error);
+        /*
+         * Remove inode so that it will be reloaded by VFS_VGET and
+         * checked to see if it is an alias of an existing entry in
+         * the inode cache.
+         */
+       /* Used to be vput, but that causes us to call VOP_INACTIVE twice. */
+       VOP_UNLOCK(*vpp,0);
+       lfs_vunref(*vpp);
+        (*vpp)->v_type = VNON;
+        vgone(*vpp);
+        *vpp = 0;
+        return (0);
 }
 
 int