[DRBD-cvs] svn commit by phil - r2765 - trunk/drbd - Make it compile again ; (

drbd-cvs at lists.linbit.com drbd-cvs at lists.linbit.com
Wed Feb 21 12:26:52 CET 2007


Author: phil
Date: 2007-02-21 12:26:50 +0100 (Wed, 21 Feb 2007)
New Revision: 2765

Modified:
   trunk/drbd/drbd_actlog.c
   trunk/drbd/drbd_receiver.c
Log:
Make it compile again ;(


Modified: trunk/drbd/drbd_actlog.c
===================================================================
--- trunk/drbd/drbd_actlog.c	2007-02-21 10:57:09 UTC (rev 2764)
+++ trunk/drbd/drbd_actlog.c	2007-02-21 11:26:50 UTC (rev 2765)
@@ -697,7 +697,7 @@
 		// In case we had IOs and they are already complete, there
 		// is not point in waiting anyways.
 		// Therefore this if() ...
-		if(atomic_read(&wc.io_done)) wait_for_completion(&wc.io_done);
+		if(atomic_read(&wc.count)) wait_for_completion(&wc.io_done);
 
 		dec_local(mdev);
 

Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2007-02-21 10:57:09 UTC (rev 2764)
+++ trunk/drbd/drbd_receiver.c	2007-02-21 11:26:50 UTC (rev 2765)
@@ -268,8 +268,9 @@
 		}
 		if (!bio_add_page(bio, page, min_t(int, ds, PAGE_SIZE), 0)) {
 			drbd_pp_free(mdev,page);
-			ERR("alloc_ee: bio_add_page(s=%llu,ds=%u) failed\n",
-			    (unsigned long long)sector, ds);
+			ERR("alloc_ee: bio_add_page(s=%llu,"
+			    "data_size=%u,ds=%u) failed\n",
+			    (unsigned long long)sector, data_size, ds);
 			goto fail2;
 			break;
 		}



More information about the drbd-cvs mailing list