svn commit: r222722 - head/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Sun Jun  5 20:22:56 2011
New Revision: 222722
URL: http://svn.freebsd.org/changeset/base/222722

Log:
  Add support for flock(2) locks to the new NFSv4 client. I think this
  should be ok, since the client now delays NFSv4 Close operations
  until VOP_INACTIVE()/VOP_RECLAIM(). As such, there should be no
  risk that the NFSv4 Open is closed while an associated byte range lock
  still exists.
  
  Tested by:	avg
  MFC after:	2 weeks

Modified:
  head/sys/fs/nfsclient/nfs_clport.c
  head/sys/fs/nfsclient/nfs_clvnops.c

Modified: head/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clport.c	Sun Jun  5 19:25:30 2011	(r222721)
+++ head/sys/fs/nfsclient/nfs_clport.c	Sun Jun  5 20:22:56 2011	(r222722)
@@ -530,8 +530,11 @@ nfscl_filllockowner(void *id, u_int8_t *
 		*cp++ = tl.cval[1];
 		*cp++ = tl.cval[2];
 		*cp = tl.cval[3];
+	} else if ((flags & F_FLOCK) != 0) {
+		bcopy(&id, cp, sizeof(id));
+		bzero(&cp[sizeof(id)], NFSV4CL_LOCKNAMELEN - sizeof(id));
 	} else {
-		printf("nfscl_filllockowner: not F_POSIX\n");
+		printf("nfscl_filllockowner: not F_POSIX or F_FLOCK\n");
 		bzero(cp, NFSV4CL_LOCKNAMELEN);
 	}
 }

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c	Sun Jun  5 19:25:30 2011	(r222721)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Sun Jun  5 20:22:56 2011	(r222722)
@@ -2884,8 +2884,11 @@ nfs_advlock(struct vop_advlock_args *ap)
 	int ret, error = EOPNOTSUPP;
 	u_quad_t size;
 	
-	if (NFS_ISV4(vp) && (ap->a_flags & F_POSIX)) {
-		cred = p->p_ucred;
+	if (NFS_ISV4(vp) && (ap->a_flags & (F_POSIX | F_FLOCK)) != 0) {
+		if ((ap->a_flags & F_POSIX) != 0)
+			cred = p->p_ucred;
+		else
+			cred = td->td_ucred;
 		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		if (vp->v_iflag & VI_DOOMED) {
 			VOP_UNLOCK(vp, 0);