patch-2.3.1 linux/drivers/block/raid5.c

• Lines: 18
• Date: Tue May 11 23:37:51 1999
• Orig file: v2.3.0/linux/drivers/block/raid5.c
• Orig date: Fri May 8 00:17:13 1998

diff -u --recursive --new-file v2.3.0/linux/drivers/block/raid5.c linux/drivers/block/raid5.c
@@ -91,7 +91,7 @@
 
 void __wait_on_stripe(struct stripe_head *sh)
 {
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 
 	PRINTK(("wait_on_stripe %lu\n", sh->sector));
 	sh->count++;
@@ -1395,7 +1395,7 @@
 		goto abort;
 	memset(raid_conf->stripe_hashtbl, 0, HASH_PAGES * PAGE_SIZE);
 
-	init_waitqueue(&raid_conf->wait_for_stripe);
+	init_waitqueue_head(&raid_conf->wait_for_stripe);
 	PRINTK(("raid5_run(%d) called.\n", minor));
 
   	for (i = 0; i < mddev->nb_dev; i++) {