MegaRAID SAS: Convert aen_mutex to the mutex API
Subsystems (2)
PATCH 1/1 MegaRAID SAS: Convert aen_mutex to the mutex API
MegaRAID SAS: Convert aen_mutex to the mutex API
--
index e3c5c52..3ad379f 100644
drivers/scsi/megaraid/megaraid_sas.c +4 -3
@@ -31,6 +31,7 @@#include <linux/moduleparam.h> #include <linux/module.h> #include <linux/spinlock.h> +#include <linux/mutex.h> #include <linux/interrupt.h> #include <linux/delay.h> #include <linux/uio.h>
@@ -2358,7 +2359,7 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)spin_lock_init (&instance->cmd_pool_lock); -sema_init (&instance->aen_mutex,1 ); +mutex_init (&instance->aen_mutex);sema_init (&instance->ioctl_sem,MEGASAS_INT_CMDS );/*
@@ -2874,10 +2875,10 @@ static int megasas_mgmt_ioctl_aen(struct file *file, unsigned long arg)if (!instance)return -ENODEV ; -down (&instance->aen_mutex); +mutex_lock (&instance->aen_mutex); error =megasas_register_aen (instance, aen.seq_num, aen.class_locale_word); -up (&instance->aen_mutex); +mutex_unlock (&instance->aen_mutex);return error; }
drivers/scsi/megaraid/megaraid_sas.h +1 -1
@@ -1089,7 +1089,7 @@ struct megasas_instance {struct megasas_evt_detail *evt_detail;dma_addr_t evt_detail_h;struct megasas_cmd *aen_cmd; -struct semaphore aen_mutex; +struct mutex aen_mutex;struct semaphore ioctl_sem;struct Scsi_Host *host;
Signature · 11 lines
Matthias Kaehlcke
Linux Application Developer
Barcelona
Tant qu'il y aura sur terre des hommes pour qui existe un concept
d' 'honneur national', la menace d'une nouvelle guerre subsistera.
(B. Traven)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-ACK
Thanks.
Bo Yang
-----Original Message-----
From: Matthias Kaehlcke [mailto:[email protected]]
Sent: Saturday, October 27, 2007 3:49 AM
To: DL-MegaRAID Linux; [email protected]
Cc: [email protected]; Andrew Morton
Subject: [PATCH] MegaRAID SAS: Convert aen_mutex to the mutex API
MegaRAID SAS: Convert aen_mutex to the mutex API
--
index e3c5c52..3ad379f 100644
drivers/scsi/megaraid/megaraid_sas.c +1 -0
@@ -31,6 +31,7 @@#include <linux/moduleparam.h> #include <linux/module.h> #include <linux/spinlock.h> +#include <linux/mutex.h> #include <linux/interrupt.h> #include <linux/delay.h> #include <linux/uio.h>
@@ -2358,7 +2359,7 @@ megasas_probe_one(struct pci_dev *pdev, const
struct pci_device_id *id)
spin_lock_init(&instance->cmd_pool_lock);
- sema_init(&instance->aen_mutex, 1);
+ mutex_init(&instance->aen_mutex);
sema_init(&instance->ioctl_sem, MEGASAS_INT_CMDS);
/*
@@ -2874,10 +2875,10 @@ static int megasas_mgmt_ioctl_aen(struct file *file, unsigned long arg)
if (!instance)
return -ENODEV;
- down(&instance->aen_mutex);
+ mutex_lock(&instance->aen_mutex);
error = megasas_register_aen(instance, aen.seq_num,
aen.class_locale_word);
- up(&instance->aen_mutex);
+ mutex_unlock(&instance->aen_mutex);
return error;
}
(quoted diff) +0 -0
b/drivers/scsi/megaraid/megaraid_sas.h
index 4dffc91..08c74c9 100644
drivers/scsi/megaraid/megaraid_sas.h +1 -1
@@ -1089,7 +1089,7 @@ struct megasas_instance {struct megasas_evt_detail *evt_detail;dma_addr_t evt_detail_h;struct megasas_cmd *aen_cmd; -struct semaphore aen_mutex; +struct mutex aen_mutex;struct semaphore ioctl_sem;struct Scsi_Host *host;
--
Matthias Kaehlcke
Linux Application Developer
Barcelona
Tant qu'il y aura sur terre des hommes pour qui existe un concept d' 'honneur national', la menace d'une nouvelle guerre subsistera.
(B. Traven)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
. '`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-