From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Mon, 23 Mar 2009 19:00:02 +0000 (+0000)
Subject: DEVEL15-disconnected-dont-double-dequeue-shadow-removal-20090323
X-Git-Tag: openafs-devel-1_5_58~26
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=fc5f9be3c501a97f254b73273511524a05972502;p=packages%2Fo%2Fopenafs.git

DEVEL15-disconnected-dont-double-dequeue-shadow-removal-20090323

LICENSE IPL10
FIXES 124496

queue_Remove twice tends to cause things like panics


(cherry picked from commit ad20213bbba4083160a88c2f65e5e8c8de259266)
---

diff --git a/src/afs/afs_disconnected.c b/src/afs/afs_disconnected.c
index 68486c593..716dfadfd 100644
--- a/src/afs/afs_disconnected.c
+++ b/src/afs/afs_disconnected.c
@@ -1317,10 +1317,8 @@ afs_DisconDiscardAllShadows(int squash, struct AFS_UCRED *acred) {
 	if (squash)
 	   afs_ResetVCache(tvc, acred);
 
-	ObtainWriteLock(&afs_disconDirtyLock, 709);
-	QRemove(&tvc->shadowq);
-
 	ReleaseWriteLock(&tvc->lock);
+	ObtainWriteLock(&afs_disconDirtyLock, 709);
     }				/* while (tvc) */
 }