[DRBD-cvs] svn commit by phil - r2302 - trunk/drbd - We missed to call tl_clear() in case fencing-policy was

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-07-27 14:59:48 +0200 (Thu, 27 Jul 2006)
New Revision: 2302

Modified:
   trunk/drbd/drbd_main.c
   trunk/drbd/drbd_worker.c
Log:
We missed to call tl_clear() in case fencing-policy was set to 
resource-and-stonith. Fixed.



Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-07-27 09:37:40 UTC (rev 2301)
+++ trunk/drbd/drbd_main.c	2006-07-27 12:59:48 UTC (rev 2302)
@@ -349,6 +349,8 @@
 	sector_t sector;
 	unsigned int size;
 
+	WARN("tl_clear()\n");
+
 	spin_lock_irq(&mdev->tl_lock);
 
 	b=mdev->oldest_barrier;

Modified: trunk/drbd/drbd_worker.c
===================================================================
--- trunk/drbd/drbd_worker.c	2006-07-27 09:37:40 UTC (rev 2301)
+++ trunk/drbd/drbd_worker.c	2006-07-27 12:59:48 UTC (rev 2302)
@@ -656,16 +656,8 @@
  */
 int w_disconnect(drbd_dev *mdev, struct drbd_work *w, int cancel)
 {
-	enum fencing_policy fp;
-
 	D_ASSERT(cancel);
 
-	fp = DontCare;
-	if(inc_local(mdev)) {
-		fp = mdev->bc->fencing;
-		dec_local(mdev);
-	}
-
 	down(&mdev->data.mutex);
 	/* By grabbing the sock_mutex we make sure that no one
 	   uses the socket right now. */
@@ -687,7 +679,7 @@
 	// primary
 	clear_bit(ISSUE_BARRIER,&mdev->flags);
 
-	if(fp != Stonith ) {
+	if(!mdev->state.susp) {
 		tl_clear(mdev);
 		D_ASSERT(mdev->oldest_barrier->n_req == 0);