d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for flock(2) locks to the new NFSv4 client. I think this

Browse Source 
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
This commit is contained in:
Rick Macklem 2011-06-05 20:22:56 +00:00
parent 7aadd02faf
commit fb35711d76
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/fs/nfsclient/nfs_clport.c
View File

@ -530,8 +530,11 @@ nfscl_filllockowner(void *id, u_int8_t *cp, int flags)
*cp++ = tl.cval[1]; *cp++ = tl.cval[1];
*cp++ = tl.cval[2]; *cp++ = tl.cval[2];
*cp = tl.cval[3]; *cp = tl.cval[3];
} else if ((flags & F_FLOCK) != 0) {
bcopy(&id, cp, sizeof(id));
bzero(&cp[sizeof(id)], NFSV4CL_LOCKNAMELEN - sizeof(id));
} else { } else {
printf("nfscl_filllockowner: not F_POSIX\n"); printf("nfscl_filllockowner: not F_POSIX or F_FLOCK\n");
bzero(cp, NFSV4CL_LOCKNAMELEN); bzero(cp, NFSV4CL_LOCKNAMELEN);
} }
} }

7
sys/fs/nfsclient/nfs_clvnops.c
View File

@ -2884,8 +2884,11 @@ nfs_advlock(struct vop_advlock_args *ap)
int ret, error = EOPNOTSUPP; int ret, error = EOPNOTSUPP;
u_quad_t size; u_quad_t size;
if (NFS_ISV4(vp) && (ap->a_flags & F_POSIX)) { if (NFS_ISV4(vp) && (ap->a_flags & (F_POSIX | F_FLOCK)) != 0) {
cred = p->p_ucred; if ((ap->a_flags & F_POSIX) != 0)
cred = p->p_ucred;
else
cred = td->td_ucred;
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
if (vp->v_iflag & VI_DOOMED) { if (vp->v_iflag & VI_DOOMED) {
VOP_UNLOCK(vp, 0); VOP_UNLOCK(vp, 0);