add POSIX-style byte-level record locking

[unix-history] / usr / src / sys / kern / vfs_subr.c

diff --git a/usr/src/sys/kern/vfs_subr.c b/usr/src/sys/kern/vfs_subr.c
index 9597ceb..ae73b2b 100644 (file)
--- a/usr/src/sys/kern/vfs_subr.c
+++ b/usr/src/sys/kern/vfs_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_subr.c  7.49 (Berkeley) %G%
+ *     @(#)vfs_subr.c  7.50 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -247,8 +247,6 @@ getnewvnode(tag, mp, vops, vpp)
                if (vp->v_type != VBAD)
                        vgone(vp);
                vp->v_flag = 0;
                if (vp->v_type != VBAD)
                        vgone(vp);
                vp->v_flag = 0;

-               vp->v_shlockc = 0;
-               vp->v_exlockc = 0;

                vp->v_lastr = 0;
                vp->v_socket = 0;
        }
                vp->v_lastr = 0;
                vp->v_socket = 0;
        }


@@ -827,12 +825,6 @@ vprint(label, vp)
                strcat(buf, "|VTEXT");
        if (vp->v_flag & VSYSTEM)
                strcat(buf, "|VSYSTEM");
                strcat(buf, "|VTEXT");
        if (vp->v_flag & VSYSTEM)
                strcat(buf, "|VSYSTEM");

-       if (vp->v_flag & VEXLOCK)
-               strcat(buf, "|VEXLOCK");
-       if (vp->v_flag & VSHLOCK)
-               strcat(buf, "|VSHLOCK");
-       if (vp->v_flag & VLWAIT)
-               strcat(buf, "|VLWAIT");

        if (vp->v_flag & VXLOCK)
                strcat(buf, "|VXLOCK");
        if (vp->v_flag & VXWANT)
        if (vp->v_flag & VXLOCK)
                strcat(buf, "|VXLOCK");
        if (vp->v_flag & VXWANT)