[DRBD-cvs] r1633 - trunk/drbd

[svn at svn.drbd.org]

Author: phil
Date: 2004-11-08 20:46:04 +0100 (Mon, 08 Nov 2004)
New Revision: 1633

Modified:
   trunk/drbd/drbd_bitmap.c
   trunk/drbd/drbd_main.c
Log:
Linus has recently merged a set of patches which move all in-kernel
initializations over to the function-based form. There has been no patch to
remove the SPIN_LOCK_UNLOCKED macro, but it is not hard to see a move in
that direction once the conversion is complete. 


Modified: trunk/drbd/drbd_bitmap.c
===================================================================
--- trunk/drbd/drbd_bitmap.c	2004-11-06 12:29:38 UTC (rev 1632)
+++ trunk/drbd/drbd_bitmap.c	2004-11-08 19:46:04 UTC (rev 1633)
@@ -229,7 +229,7 @@
 	if (!b)
 		return -ENOMEM;
 	memset(b,0,sizeof(*b));
-	b->bm_lock = SPIN_LOCK_UNLOCKED;
+	spin_lock_init(&b->bm_lock);
 	init_MUTEX(&b->bm_change);
 	mdev->bitmap = b;
 	return 0;

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2004-11-06 12:29:38 UTC (rev 1632)
+++ trunk/drbd/drbd_main.c	2004-11-08 19:46:04 UTC (rev 1633)
@@ -546,7 +546,7 @@
 STATIC void drbd_thread_init(drbd_dev *mdev, struct Drbd_thread *thi,
 		      int (*func) (struct Drbd_thread *))
 {
-	thi->t_lock  = SPIN_LOCK_UNLOCKED;
+	spin_lock_init(&thi->t_lock);
 	thi->task    = NULL;
 	thi->t_state = None;
 	init_completion(&thi->startstop);
@@ -1382,12 +1382,12 @@
 	sema_init(&mdev->data.work.s,0);
 	sema_init(&mdev->meta.work.s,0);
 
-	mdev->al_lock        = SPIN_LOCK_UNLOCKED;
-	mdev->tl_lock        = SPIN_LOCK_UNLOCKED;
-	mdev->ee_lock        = SPIN_LOCK_UNLOCKED;
-	mdev->req_lock       = SPIN_LOCK_UNLOCKED;
-	mdev->pr_lock        = SPIN_LOCK_UNLOCKED;
-	mdev->send_task_lock = SPIN_LOCK_UNLOCKED;
+	spin_lock_init(&mdev->al_lock);
+	spin_lock_init(&mdev->tl_lock);
+	spin_lock_init(&mdev->ee_lock);
+	spin_lock_init(&mdev->req_lock);
+	spin_lock_init(&mdev->pr_lock);
+	spin_lock_init(&mdev->send_task_lock);
 
 	INIT_LIST_HEAD(&mdev->free_ee);
 	INIT_LIST_HEAD(&mdev->active_ee);