[DRBD-cvs] drbd by phil; Looks good. drbdadm disconnect all follo...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	drbd_dsender.c drbd_receiver.c 


Log Message:
Looks good. drbdadm disconnect all followed by drbdadm connect all
works during resync...

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_dsender.c,v
retrieving revision 1.1.2.99
retrieving revision 1.1.2.100
diff -u -3 -r1.1.2.99 -r1.1.2.100
--- drbd_dsender.c	4 May 2004 13:17:23 -0000	1.1.2.99
+++ drbd_dsender.c	4 May 2004 14:10:16 -0000	1.1.2.100
@@ -832,7 +832,7 @@
 {
 	drbd_dev *mdev = thi->mdev;
 	struct drbd_work *w = 0;
-	int intr,socket_ok=1;
+	int intr;
 
 	sprintf(current->comm, "drbd%d_worker", (int)(mdev-drbd_conf));
 
@@ -863,14 +863,8 @@
 		}
 		spin_unlock_irq(&mdev->req_lock);
 
-		if(!socket_ok && mdev->cstate >= Connected) {
-			socket_ok = 1;
-			INFO("worker: socket_ok=1\n");
-		}
-
-		if(!w->cb(mdev,w,!socket_ok)) {
-			socket_ok = 0;
-			ERR("worker: a callback failed! socket_ok=0\n");
+		if(!w->cb(mdev,w, mdev->cstate < Connected )) {
+			ERR("worker: a callback failed! \n");
 			drbd_thread_restart_nowait(&mdev->receiver);
 		}
 	}
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_receiver.c,v
retrieving revision 1.97.2.138
retrieving revision 1.97.2.139
diff -u -3 -r1.97.2.138 -r1.97.2.139
--- drbd_receiver.c	4 May 2004 13:17:23 -0000	1.97.2.138
+++ drbd_receiver.c	4 May 2004 14:10:16 -0000	1.97.2.139
@@ -604,9 +604,6 @@
 			smp_rmb();
 			if ((volatile int)mdev->receiver.t_state == Exiting)
 				return 0;
-
-			WARN("Signal pending x%lx, but t_state not Exiting??\n",
-			     current->pending.signal.sig[0]); // to be removed.
 		}
 	}