Made lockf advisory locking code generic (rather than ufs specific), and

use it in NFS. This is required both for diskless support and for POSIX
compliance. Note: the support in NFS is only for the local node.

Submitted by:	based on work originally done by Yuval Yurom

2 files changed, 11 insertions, 3 deletions

diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 6d7eb92..70a6a88 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
- * $Id$
+ * $Id: nfs_vnops.c,v 1.3 1994/08/02 07:52:18 davidg Exp $
  */
 
 /*
@@ -54,6 +54,7 @@
 #include <sys/vnode.h>
 #include <sys/map.h>
 #include <sys/dirent.h>
+#include <sys/lockf.h>
 
 #include <vm/vm.h>
 
@@ -2204,8 +2205,14 @@ nfs_advlock(ap)
 		int  a_flags;
 	} */ *ap;
 {
+	register struct nfsnode *np = VTONFS(ap->a_vp);
 
-	return (EOPNOTSUPP);
+	/*
+	 * The following kludge is to allow diskless support to work
+	 * until a real NFS lockd is implemented. Basically, just pretend
+	 * that this is a local lock.
+	 */
+	return (lf_advlock(ap, &(np->n_lockf), np->n_size));
 }
 
 /*
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 0fe5d48..f21f220 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id$
+ * $Id: nfsnode.h,v 1.2 1994/08/02 07:52:22 davidg Exp $
  */
 
 /*
@@ -66,6 +66,7 @@ struct nfsnode {
 	time_t	n_attrstamp;		/* Time stamp for cached attributes */
 	struct	sillyrename *n_sillyrename; /* Ptr to silly rename struct */
 	u_quad_t n_size;		/* Current size of file */
+	struct	lockf *n_lockf;		/* Locking record of file */
 	int	n_error;		/* Save write error value */
 	u_long	n_direofoffset;		/* Dir. EOF offset cache */
 	time_t	n_mtime;		 /* Prev modify time. */