[prev in list] [next in list] [prev in thread] [next in thread] 

List:       drbd-cvs
Subject:    [DRBD-cvs] drbd by phil; Missing stuff. for last commit.
From:       drbd-cvs () linbit ! com
Date:       2004-04-29 14:48:25
Message-ID: 20040429144825.3909615DF5C () garcon ! linbit ! com
[Download RAW message or body]

DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


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


Log Message:
Missing stuff. for last commit.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_dsender.c,v
retrieving revision 1.1.2.94
retrieving revision 1.1.2.95
diff -u -3 -r1.1.2.94 -r1.1.2.95
--- drbd_dsender.c	26 Apr 2004 08:50:16 -0000	1.1.2.94
+++ drbd_dsender.c	29 Apr 2004 14:48:20 -0000	1.1.2.95
@@ -277,7 +277,7 @@
 	sector_t rsector;
 
 	// see above
-	if (bio->bi_size)
+	ERR_IF(bio->bi_size)
 		return 1;
 
 #if 0
@@ -298,7 +298,7 @@
 	PARANOIA_BUG_ON(!VALID_POINTER(req));
 
 	drbd_chk_io_error(mdev,error);
-	rsector = drbd_req_get_sector(req); 
+	rsector = drbd_req_get_sector(req);
         // the bi_sector of the bio gets modified somewhere in drbd_end_req()!
 	drbd_end_req(req, RQ_DRBD_LOCAL, (error == 0), rsector);
 	drbd_al_complete_io(mdev,rsector);
@@ -314,7 +314,7 @@
 	drbd_request_t *req;
 
 	// see above
-	if (bio->bi_size)
+	ERR_IF(bio->bi_size)
 		return 1;
 
 #if 0
@@ -377,7 +377,8 @@
 	drbd_request_t *req = (drbd_request_t*)w;
 	int ok;
 
-	if ( cancel || 
+	smp_rmb();
+	if ( cancel ||
 	     mdev->cstate < Connected ||
 	     test_bit(PARTNER_DISKLESS,&mdev->flags) ) {
 		ERR("WE ARE LOST. Local IO failure, no peer.\n");



[prev in list] [next in list] [prev in thread] [next in thread]