Skip to contentSkip to conversation

lpfc: mutex conversion

PATCH New Christoph Hellwig 1 participant 1 message Jan 31, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lpfc: mutex conversion

switch lpfc from semaphore to mutex locking

drivers/scsi/lpfc/lpfc.h +1 -1
Index: linux-2.6/drivers/scsi/lpfc/lpfc.h
===================================================================
@@ -173,7 +173,7 @@
 	dma_addr_t slim2p_mapping;
 	uint16_t pci_cfg_value;
 
-	struct semaphore hba_can_block;
+	struct mutex hba_can_block;
 	uint32_t hba_state;
 
 #define LPFC_INIT_START           1	/* Initial state after board reset */
drivers/scsi/lpfc/lpfc_init.c +1 -1
Index: linux-2.6/drivers/scsi/lpfc/lpfc_init.c
===================================================================
@@ -1393,7 +1393,7 @@
 		goto out_put_host;
 
 	host->unique_id = phba->brd_no;
-	init_MUTEX(&phba->hba_can_block);
+	mutex_init(&phba->hba_can_block);
 	INIT_LIST_HEAD(&phba->ctrspbuflist);
 	INIT_LIST_HEAD(&phba->rnidrspbuflist);
 	INIT_LIST_HEAD(&phba->freebufList);
drivers/scsi/lpfc/lpfc_scsi.c +2 -2
Index: linux-2.6/drivers/scsi/lpfc/lpfc_scsi.c
===================================================================
@@ -44,7 +44,7 @@
 static inline void
 lpfc_block_requests(struct lpfc_hba * phba)
 {
-	down(&phba->hba_can_block);
+	mutex_lock(&phba->hba_can_block);
 	scsi_block_requests(phba->host);
 }
 
@@ -52,7 +52,7 @@
 lpfc_unblock_requests(struct lpfc_hba * phba)
 {
 	scsi_unblock_requests(phba->host);
-	up(&phba->hba_can_block);
+	mutex_unlock(&phba->hba_can_block);
 }
 
 /*