diff options
| author | Rick Macklem <rmacklem@FreeBSD.org> | 2011-06-05 18:17:37 +0000 |
|---|---|---|
| committer | Rick Macklem <rmacklem@FreeBSD.org> | 2011-06-05 18:17:37 +0000 |
| commit | f8f4e256e717a0238d41223a9cdfe3fbeae02461 (patch) | |
| tree | 35b381de51f06dd88e54c67bb67b2d8a156bf014 /sys/fs/nfsclient/nfs_clvnops.c | |
| parent | 2301f58fe54fcb0d6b2e94111d43d5c90d9cdd80 (diff) | |
| download | src-test2-f8f4e256e717a0238d41223a9cdfe3fbeae02461.tar.gz src-test2-f8f4e256e717a0238d41223a9cdfe3fbeae02461.zip | |
Notes
Diffstat (limited to 'sys/fs/nfsclient/nfs_clvnops.c')
| -rw-r--r-- | sys/fs/nfsclient/nfs_clvnops.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 984724d93aed..9f7ac0e3d639 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -2898,7 +2898,8 @@ nfs_advlock(struct vop_advlock_args *ap) * RFC3530 Sec. 9.3.2. */ if (ap->a_op == F_UNLCK && - nfscl_checkwritelocked(vp, ap->a_fl, cred, td)) + nfscl_checkwritelocked(vp, ap->a_fl, cred, td, ap->a_id, + ap->a_flags)) (void) ncl_flush(vp, MNT_WAIT, cred, td, 1, 0); /* @@ -2907,7 +2908,7 @@ nfs_advlock(struct vop_advlock_args *ap) */ do { ret = nfsrpc_advlock(vp, np->n_size, ap->a_op, - ap->a_fl, 0, cred, td); + ap->a_fl, 0, cred, td, ap->a_id, ap->a_flags); if (ret == NFSERR_DENIED && (ap->a_flags & F_WAIT) && ap->a_op == F_SETLK) { VOP_UNLOCK(vp, 0); |