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.

Reviewed-on: http://gerrit.openafs.org/2942
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit c2ed2577f9c16df3088158fb593d7aab6e8690d0)
Change-Id: I4479a8941b8c53aed1949134e171133d338919bb
Reviewed-on: http://gerrit.openafs.org/3053

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index cbd94d797ebcc64a6187074481ee452dd44c673d..57f7db89ce11a0268a42c09d07abbbdffb1413f3 100644 (file)
--- 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);