diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2010-09-09 15:45:11 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2010-09-09 15:45:11 +0000 |
| commit | 3a255aa391bd4b025a56a2adf21d4b51c4e309ea (patch) | |
| tree | dea0ee2da58e6ce20f281539201b86655435237a /sys/fs/nfsclient | |
| parent | 6a5624ed415a1c6745c851f3bf2e3beb1d481706 (diff) | |
| download | FreeBSD-src-3a255aa391bd4b025a56a2adf21d4b51c4e309ea.zip FreeBSD-src-3a255aa391bd4b025a56a2adf21d4b51c4e309ea.tar.gz | |
Fix the experimental NFS client so that it doesn't panic when
NFSv2,3 byte range locking is attempted. A fix that allows the
nlm_advlock() to work with both clients is in progress, but
may take a while. As such, I am doing this commit so that
the kernel doesn't panic in the meantime.
Submitted by: jh
MFC after: 2 weeks
Diffstat (limited to 'sys/fs/nfsclient')
| -rw-r--r-- | sys/fs/nfsclient/nfs_clvnops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 1e4e8a6..8f1ec27 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -2939,8 +2939,10 @@ nfs_advlock(struct vop_advlock_args *ap) } else { if (ncl_advlock_p) error = ncl_advlock_p(ap); - else + else { + VOP_UNLOCK(vp, 0); error = ENOLCK; + } } } return (error); |
