From: Ben Kaduk <kaduk@mit.edu>
Date: Mon, 20 Dec 2010 00:33:28 +0000 (-0500)
Subject: FBSD7: Don't sleep with the glock
X-Git-Tag: upstream/1.8.0_pre1^2~4350
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b1cb3607ff66b7fc6201fab2af57761156b1927f;p=packages%2Fo%2Fopenafs.git

FBSD7: Don't sleep with the glock

On FreeBSD 7.X, vinvalbuf() can (will) sleep; this results in a panic
when the kernel is configured with WITNESS and we hold the glock around
it.
Drop the glock in this case.

Change-Id: I0036aad3059805d77afe9aa9bf7f5d421d6810f8
Reviewed-on: http://gerrit.openafs.org/3551
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c
index 26ed2c2be..8502d6a53 100644
--- a/src/afs/afs_vcache.c
+++ b/src/afs/afs_vcache.c
@@ -1646,7 +1646,9 @@ afs_GetVCache(struct VenusFid *afid, struct vrequest *areq,
 	iheldthelock = VOP_ISLOCKED(vp, curthread);
 	if (!iheldthelock)
 	    vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+	AFS_GUNLOCK();
 	vinvalbuf(vp, V_SAVE, curthread, PINOD, 0);
+	AFS_GLOCK();
 	if (!iheldthelock)
 	    VOP_UNLOCK(vp, LK_EXCLUSIVE, curthread);
 #elif defined(AFS_FBSD_ENV)