From 8ef28051b242ec22121550a167e59964bc0a23ca Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Tue, 5 Oct 2010 23:30:35 -0400 Subject: [PATCH] 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 Tested-by: Derrick Brashear (cherry picked from commit c2ed2577f9c16df3088158fb593d7aab6e8690d0) Change-Id: I4479a8941b8c53aed1949134e171133d338919bb Reviewed-on: http://gerrit.openafs.org/3053 --- src/afs/FBSD/osi_vnodeops.c | 2 -- 1 file changed, 2 deletions(-) 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); -- 2.39.5