diff options
| author | dfr <dfr@FreeBSD.org> | 1997-04-04 17:49:35 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1997-04-04 17:49:35 +0000 |
| commit | 290a0d9360310ac92d01cfc64a53d6bf7ab7bdd1 (patch) | |
| tree | b639f0a11f6ef68503e426899f8cd98dbaeeae79 /sys/nfsserver | |
| parent | 5974d18a75cb3c6a9b4abc4a5f45fcfe3e47f1fe (diff) | |
| download | FreeBSD-src-290a0d9360310ac92d01cfc64a53d6bf7ab7bdd1.zip FreeBSD-src-290a0d9360310ac92d01cfc64a53d6bf7ab7bdd1.tar.gz | |
Fix various bugs in the locking protocol, allowing proper shared locks
to be used. This should fix the lock panics that people are seeing.
Diffstat (limited to 'sys/nfsserver')
| -rw-r--r-- | sys/nfsserver/nfs_srvsubs.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index 15497ff..572ccc2 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id$ + * $Id: nfs_subs.c,v 1.37 1997/02/22 09:42:41 peter Exp $ */ /* @@ -1280,14 +1280,6 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) */ np = VTONFS(vp); if (vp->v_type != vtyp) { - /* - * If we had a lock and it turns out that the vnode - * is an object which we don't want to lock (e.g. VDIR) - * to avoid nasty hanging problems on a server crash, - * then release it here. - */ - if (vtyp != VREG && VOP_ISLOCKED(vp)) - VOP_UNLOCK(vp, 0, p); vp->v_type = vtyp; if (vp->v_type == VFIFO) { vp->v_op = fifo_nfsv2nodeop_p; |
