[DRBD-cvs] drbd by phil; Various microupdates...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	drbd_actlog.c drbd_dsender.c drbd_fs.c drbd_int.h drbd_main.c 


Log Message:
Various microupdates...

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_actlog.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_actlog.c	6 May 2004 12:44:10 -0000	1.1.2.99
+++ drbd_actlog.c	11 May 2004 13:14:49 -0000	1.1.2.100
@@ -549,7 +549,7 @@
 		bm_end_of_dev_case(mdev->mbds_id);
 
 	INFO("%lu KB marked out-of-sync by on disk bit-map.\n",
-	     (unsigned long) mdev->rs_total>>1);
+	     (unsigned long) (mdev->rs_total+1)>>1);
 }
 
 /**
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_dsender.c,v
retrieving revision 1.1.2.105
retrieving revision 1.1.2.106
diff -u -3 -r1.1.2.105 -r1.1.2.106
--- drbd_dsender.c	6 May 2004 13:59:13 -0000	1.1.2.105
+++ drbd_dsender.c	11 May 2004 13:14:49 -0000	1.1.2.106
@@ -800,7 +800,7 @@
 
 	INFO("Resync started as %s (need to sync %lu KB).\n",
 	     side == SyncTarget ? "target" : "source", 
-	     (unsigned long) mdev->rs_left>>1);
+	     (unsigned long) (mdev->rs_left+1)>>1);
 
 	/* no longer true since we queue the write hints here, too
 	  PARANOIA_BUG_ON(!list_empty(&mdev->resync_work.list));
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_fs.c,v
retrieving revision 1.28.2.86
retrieving revision 1.28.2.87
diff -u -3 -r1.28.2.86 -r1.28.2.87
--- drbd_fs.c	7 May 2004 15:18:28 -0000	1.28.2.86
+++ drbd_fs.c	11 May 2004 13:14:49 -0000	1.28.2.87
@@ -886,6 +886,10 @@
 		goto out_unlocked;
 
 	case DRBD_IOCTL_INVALIDATE:
+		/* TODO
+		 * differentiate between different error cases,
+		 * or report the current connection state and flags back
+		 * to userspace */
 		if( mdev->cstate != Connected ||
 		    test_bit(DISKLESS,&mdev->flags) || 
 		    test_bit(PARTNER_DISKLESS,&mdev->flags) ) {
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_int.h,v
retrieving revision 1.58.2.159
retrieving revision 1.58.2.160
diff -u -3 -r1.58.2.159 -r1.58.2.160
--- drbd_int.h	6 May 2004 11:53:00 -0000	1.58.2.159
+++ drbd_int.h	11 May 2004 13:14:49 -0000	1.58.2.160
@@ -502,8 +502,7 @@
  * Having this as the first member of a struct provides sort of "inheritance".
  * "derived" structs can be "drbd_queue_work()"ed.
  * The callback should know and cast back to the descendant struct.
- * drbd_request, Pending_read and Tl_epoch_entry are descendants of drbd_work.
- * Pending_read will soon be merged into drbd_request, stay tuned ... -lge
+ * drbd_request and Tl_epoch_entry are descendants of drbd_work.
  */
 struct drbd_work;
 typedef int (*drbd_work_cb)(drbd_dev*, struct drbd_work*, int cancel);
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_main.c,v
retrieving revision 1.73.2.169
retrieving revision 1.73.2.170
diff -u -3 -r1.73.2.169 -r1.73.2.170
--- drbd_main.c	10 May 2004 10:49:28 -0000	1.73.2.169
+++ drbd_main.c	11 May 2004 13:14:49 -0000	1.73.2.170
@@ -496,7 +496,6 @@
 	} else {
 		spin_unlock(&thi->t_lock);
 	}
-
 }
 
 
@@ -616,10 +615,10 @@
 	restore_old_sigset(old_blocked);
 
 	if (sock == mdev->data.socket) {
-		up(&mdev->data.mutex);
 		spin_lock(&mdev->send_task_lock);
 		mdev->send_task=NULL;
 		spin_unlock(&mdev->send_task_lock);
+		up(&mdev->data.mutex);
 	} else
 		up(&mdev->meta.mutex);
 	return ok;