From: Ben Kaduk <kaduk@mit.edu>
Date: Wed, 6 Oct 2010 03:30:35 +0000 (-0400)
Subject: FBSD: in lookup, when ISDOTDOT, unlock dvp
X-Git-Tag: upstream/1.8.0_pre1^2~4697
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c2ed2577f9c16df3088158fb593d7aab6e8690d0;p=packages%2Fo%2Fopenafs.git

FBSD: in lookup, when ISDOTDOT, unlock dvp

Keeping dvp locked when vp is its parent can lead to deadlock.
Always unlock dvp, not just for 6 and earlier.

Change-Id: I26a60188d39ccd24b4db7479c57a525bb37618e9
Reviewed-on: http://gerrit.openafs.org/2942
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index cbd94d797..57f7db89c 100644
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -503,10 +503,8 @@ afs_vop_lookup(ap)
     cnp->cn_flags |= MPSAFE; /* steel */
 #endif
 
-#ifndef AFS_FBSD70_ENV
     if (flags & ISDOTDOT)
 	VOP_UNLOCK(dvp, 0, p);
-#endif
 
     AFS_GLOCK();
     error = afs_lookup(VTOAFS(dvp), name, &vcp, cnp->cn_cred);