[DRBD-cvs] drbd by phil; Renamed __drbd_queue_work() to drbd_queu...

[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_int.h 


Log Message:
Renamed __drbd_queue_work() to drbd_queue_work(). 
Introduced _drbd_queue_work() which should be used if you already
have the lock.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_actlog.c,v
retrieving revision 1.1.2.57
retrieving revision 1.1.2.58
diff -u -3 -r1.1.2.57 -r1.1.2.58
--- drbd_actlog.c	16 Jan 2004 17:34:30 -0000	1.1.2.57
+++ drbd_actlog.c	18 Jan 2004 07:26:50 -0000	1.1.2.58
@@ -512,7 +512,7 @@
 		D_ASSERT( mdev->resync_work.cb == w_resync_inactive );
 		// Could also call directly. This runs in worker's context.
 		mdev->resync_work.cb = w_resync_finished;
-		__drbd_queue_work(mdev,&mdev->data.work,&mdev->resync_work);
+		drbd_queue_work(mdev,&mdev->data.work,&mdev->resync_work);
 	}
 	
 	return 1;
@@ -568,7 +568,7 @@
 			}
 			udw->enr = enr*SM;
 			udw->w.cb = w_update_odbm;
-			__drbd_queue_work(mdev,&mdev->data.work,&udw->w);
+			drbd_queue_work(mdev,&mdev->data.work,&udw->w);
 			lc_del(mdev->resync,&ext->lce);
 		}
 	}
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_dsender.c,v
retrieving revision 1.1.2.52
retrieving revision 1.1.2.53
diff -u -3 -r1.1.2.52 -r1.1.2.53
--- drbd_dsender.c	17 Jan 2004 20:05:34 -0000	1.1.2.52
+++ drbd_dsender.c	18 Jan 2004 07:26:50 -0000	1.1.2.53
@@ -69,7 +69,7 @@
 	list_del(&e->w.list);
 	spin_unlock_irqrestore(&mdev->ee_lock,flags);
 
-	__drbd_queue_work(mdev,&mdev->data.work,&e->w);
+	drbd_queue_work(mdev,&mdev->data.work,&e->w);
 }
 
 int w_resync_inactive(drbd_dev *mdev, struct drbd_work *w)
@@ -100,7 +100,7 @@
 
 	mdev = (drbd_dev*) data;
 
-	__drbd_queue_work(mdev,&mdev->data.work,&mdev->resync_work);
+	drbd_queue_work(mdev,&mdev->data.work,&mdev->resync_work);
 }
 
 STATIC int w_make_resync_request(drbd_dev* mdev, struct drbd_work* w)
@@ -256,7 +256,7 @@
 
 	if ( mdev->rs_left == 0 ) {
 		mdev->resync_work.cb = w_resync_finished;
-		__drbd_queue_work(mdev,&mdev->data.work,&mdev->resync_work);
+		drbd_queue_work(mdev,&mdev->data.work,&mdev->resync_work);
 		return;
 	}
 
@@ -264,7 +264,7 @@
 		mdev->gen_cnt[Flags] &= ~MDF_Consistent;
 		bm_reset(mdev->mbds_id);
 		mdev->resync_work.cb = w_make_resync_request;
-		__drbd_queue_work(mdev,&mdev->data.work,&mdev->resync_work);
+		drbd_queue_work(mdev,&mdev->data.work,&mdev->resync_work);
 	} else {
 		// If we are SyncSource we must be consistent :)
 		mdev->gen_cnt[Flags] |= MDF_Consistent;
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_int.h,v
retrieving revision 1.58.2.96
retrieving revision 1.58.2.97
diff -u -3 -r1.58.2.96 -r1.58.2.97
--- drbd_int.h	17 Jan 2004 20:17:38 -0000	1.58.2.96
+++ drbd_int.h	18 Jan 2004 07:26:50 -0000	1.58.2.97
@@ -642,7 +642,7 @@
  *
  * To be general, this might need a spin_lock member.
  * For now, please use the mdev->req_lock to protect list_head,
- * see __drbd_queue_work below.
+ * see drbd_queue_work below.
  */
 struct drbd_work_queue {
 	struct list_head q;
@@ -1000,7 +1000,16 @@
  *************************/
 
 static inline void
-__drbd_queue_work(drbd_dev *mdev, struct drbd_work_queue *q,
+_drbd_queue_work(drbd_dev *mdev, struct drbd_work_queue *q,
+		  struct drbd_work *w)
+{
+	unsigned long flags;
+	list_add_tail(&w->list,&q->q);
+	up(&q->s);
+}
+
+static inline void
+drbd_queue_work(drbd_dev *mdev, struct drbd_work_queue *q,
 		  struct drbd_work *w)
 {
 	unsigned long flags;