[DRBD-cvs] svn commit by phil - r2299 - trunk/drbd - I should "code what I mean" ; )

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-07-26 16:51:53 +0200 (Wed, 26 Jul 2006)
New Revision: 2299

Modified:
   trunk/drbd/drbd_main.c
   trunk/drbd/drbd_worker.c
Log:
I should "code what I mean" ;)


Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-07-26 10:23:35 UTC (rev 2298)
+++ trunk/drbd/drbd_main.c	2006-07-26 14:51:53 UTC (rev 2299)
@@ -1704,10 +1704,6 @@
 	set_bit(UNPLUG_REMOTE,&mdev->flags);
 	ok = sizeof(p) == drbd_send(mdev,mdev->data.socket,&p,sizeof(p),MSG_MORE);
 	if(ok) {
-		spin_lock_irq(&mdev->req_lock);
-		req->rq_status |= RQ_DRBD_ON_WIRE;
-		spin_unlock_irq(&mdev->req_lock);
-
 		if(mdev->net_conf->wire_protocol == DRBD_PROT_A) {
 			ok = _drbd_send_bio(mdev,req->master_bio);
 		} else {

Modified: trunk/drbd/drbd_worker.c
===================================================================
--- trunk/drbd/drbd_worker.c	2006-07-26 10:23:35 UTC (rev 2298)
+++ trunk/drbd/drbd_worker.c	2006-07-26 14:51:53 UTC (rev 2299)
@@ -568,6 +568,10 @@
 
 	ok = drbd_send_dblock(mdev,req);
 	if (ok) {
+		spin_lock_irq(&mdev->req_lock);
+		req->rq_status |= RQ_DRBD_ON_WIRE;
+		spin_unlock_irq(&mdev->req_lock);
+
 		inc_ap_pending(mdev);
 
 		if(mdev->net_conf->wire_protocol == DRBD_PROT_A) {