Skip to contentSkip to conversation

mutex subsystem, semaphore to completion: SX8

PATCH In review Ingo Molnar 2 participants 3 messages Jan 3, 2006 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 16/19 mutex subsystem, semaphore to completion: SX8

From: Steven Rostedt <[email protected]>

change SX8 semaphores to completions.

----

 drivers/block/sx8.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
drivers/block/sx8.c +6 -5
Index: linux/drivers/block/sx8.c
===================================================================
@@ -27,6 +27,7 @@
 #include <linux/time.h>
 #include <linux/hdreg.h>
 #include <linux/dma-mapping.h>
+#include <linux/completion.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
@@ -303,7 +304,7 @@ struct carm_host {
 
 	struct work_struct		fsm_task;
 
-	struct semaphore		probe_sem;
+	struct completion		probe_comp;
 };
 
 struct carm_response {
@@ -1365,7 +1366,7 @@ static void carm_fsm_task (void *_data)
 	}
 
 	case HST_PROBE_FINISHED:
-		up(&host->probe_sem);
+		complete(&host->probe_comp);
 		break;
 
 	case HST_ERROR:
@@ -1641,7 +1642,7 @@ static int carm_init_one (struct pci_dev
 	host->flags = pci_dac ? FL_DAC : 0;
 	spin_lock_init(&host->lock);
 	INIT_WORK(&host->fsm_task, carm_fsm_task, host);
-	init_MUTEX_LOCKED(&host->probe_sem);
+	init_completion(&host->probe_comp);
 
 	for (i = 0; i < ARRAY_SIZE(host->req); i++)
 		host->req[i].tag = i;
@@ -1710,8 +1711,8 @@ static int carm_init_one (struct pci_dev
 	if (rc)
 		goto err_out_free_irq;
 
-	DPRINTK("waiting for probe_sem\n");
-	down(&host->probe_sem);
+	DPRINTK("waiting for probe_comp\n");
+	wait_for_completion(&host->probe_comp);
 
 	printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
 	       host->name, pci_name(pdev), (int) CARM_MAX_PORTS,
#1 lore raw
Quoted 16 lines · Ingo Molnar

From: Steven Rostedt <[email protected]>

change SX8 semaphores to completions.

----

 drivers/block/sx8.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

Index: linux/drivers/block/sx8.c
===================================================================

drivers/block/sx8.c line 32

Quoted 6 lines
drivers/block/sx8.c +1 -0
@@ -27,6 +27,7 @@
 #include <linux/time.h>
 #include <linux/hdreg.h>
 #include <linux/dma-mapping.h>
+#include <linux/completion.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>

These patches should remove the asm/semaphore.h when appropriate too. At a glance, this looks like one such case.

Also, these aren't really part of a mutex subsystem patch series are they?

Signature · 3 lines
SUSE Labs, Novell Inc.

Send instant messages to your online friends http://au.messenger.yahoo.com 
#2 lore raw
Quoted 5 lines · Nick Piggin
Quoted 4 lines · Ingo Molnar

From: Steven Rostedt <[email protected]>

change SX8 semaphores to completions.

Quoted 8 lines
Quoted 5 lines

+#include <linux/completion.h>
#include <asm/io.h>
#include <asm/semaphore.h>

These patches should remove the asm/semaphore.h when appropriate too. At a glance, this looks like one such case.

yeah, agreed. I did this in my tree. (the other sem2completion patches are not affected)

Quoted 2 lines

Also, these aren't really part of a mutex subsystem patch series are they?

i included them because they reduce the number of semaphores that are used in a non-mutex fashion, and thus make the mutex conversion easier. I.e. i consider both the sem2mutex and the sem2completion patches as part of the 'convert semaphores to mutexes' effort, even though sem2completions are independent technically. They can be applied independently of the mutex subsystem itself, of course.

Ingo