add POSIX-style byte-level record locking

SCCS-vsn: sys/ufs/mfs/mfs_vnops.c 7.20
SCCS-vsn: sys/ufs/ffs/ffs_inode.c 7.37
SCCS-vsn: sys/ufs/ffs/ufs_inode.c 7.37
SCCS-vsn: sys/ufs/lfs/lfs_inode.c 7.37
SCCS-vsn: sys/ufs/ufs/ufs_inode.c 7.37

diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index 8390c38..e4f7941 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_inode.c 7.36 (Berkeley) %G%
+ *     @(#)ffs_inode.c 7.37 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -113,6 +113,7 @@ loop:
        ip->i_devvp = 0;
        ip->i_mode = 0;
        ip->i_diroff = 0;
        ip->i_devvp = 0;
        ip->i_mode = 0;
        ip->i_diroff = 0;

+       ip->i_lockf = 0;

 #ifdef QUOTA
        for (i = 0; i < MAXQUOTAS; i++)
                ip->i_dquot[i] = NODQUOT;
 #ifdef QUOTA
        for (i = 0; i < MAXQUOTAS; i++)
                ip->i_dquot[i] = NODQUOT;

diff --git a/usr/src/sys/ufs/ffs/ufs_inode.c b/usr/src/sys/ufs/ffs/ufs_inode.c
index 00283a6..3b8c137 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_inode.c
+++ b/usr/src/sys/ufs/ffs/ufs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_inode.c 7.36 (Berkeley) %G%
+ *     @(#)ufs_inode.c 7.37 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -113,6 +113,7 @@ loop:
        ip->i_devvp = 0;
        ip->i_mode = 0;
        ip->i_diroff = 0;
        ip->i_devvp = 0;
        ip->i_mode = 0;
        ip->i_diroff = 0;

+       ip->i_lockf = 0;

 #ifdef QUOTA
        for (i = 0; i < MAXQUOTAS; i++)
                ip->i_dquot[i] = NODQUOT;
 #ifdef QUOTA
        for (i = 0; i < MAXQUOTAS; i++)
                ip->i_dquot[i] = NODQUOT;

diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index 5689d03..6b0bb1e 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_inode.c 7.36 (Berkeley) %G%
+ *     @(#)lfs_inode.c 7.37 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -113,6 +113,7 @@ loop:
        ip->i_devvp = 0;
        ip->i_mode = 0;
        ip->i_diroff = 0;
        ip->i_devvp = 0;
        ip->i_mode = 0;
        ip->i_diroff = 0;

+       ip->i_lockf = 0;

 #ifdef QUOTA
        for (i = 0; i < MAXQUOTAS; i++)
                ip->i_dquot[i] = NODQUOT;
 #ifdef QUOTA
        for (i = 0; i < MAXQUOTAS; i++)
                ip->i_dquot[i] = NODQUOT;

diff --git a/usr/src/sys/ufs/mfs/mfs_vnops.c b/usr/src/sys/ufs/mfs/mfs_vnops.c
index e55752a..fe291a8 100644 (file)
--- a/usr/src/sys/ufs/mfs/mfs_vnops.c
+++ b/usr/src/sys/ufs/mfs/mfs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)mfs_vnops.c 7.19 (Berkeley) %G%
+ *     @(#)mfs_vnops.c 7.20 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -73,6 +73,7 @@ struct vnodeops mfs_vnodeops = {
        mfs_strategy,           /* strategy */
        mfs_print,              /* print */
        mfs_nullop,             /* islocked */
        mfs_strategy,           /* strategy */
        mfs_print,              /* print */
        mfs_nullop,             /* islocked */

+       mfs_badop,              /* advlock */

 };
 
 /*
 };
 
 /*

diff --git a/usr/src/sys/ufs/ufs/ufs_inode.c b/usr/src/sys/ufs/ufs/ufs_inode.c
index 00283a6..3b8c137 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_inode.c
+++ b/usr/src/sys/ufs/ufs/ufs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_inode.c 7.36 (Berkeley) %G%
+ *     @(#)ufs_inode.c 7.37 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -113,6 +113,7 @@ loop:
        ip->i_devvp = 0;
        ip->i_mode = 0;
        ip->i_diroff = 0;
        ip->i_devvp = 0;
        ip->i_mode = 0;
        ip->i_diroff = 0;

+       ip->i_lockf = 0;

 #ifdef QUOTA
        for (i = 0; i < MAXQUOTAS; i++)
                ip->i_dquot[i] = NODQUOT;
 #ifdef QUOTA
        for (i = 0; i < MAXQUOTAS; i++)
                ip->i_dquot[i] = NODQUOT;