diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-12-09 16:14:26 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:47:51 -0600 |
| commit | 610aa74e352387c16829066c8a5f61d814fdbfd8 (patch) | |
| tree | 2a29c85d0727faebc740bc61f24c44923007e9c8 /ubuntu | |
| parent | a35233fc48fc30505715484aec87b1d1042783d1 (diff) | |
UBUNTU: ubuntu: iscsitarget -- follow changes to semaphore initialisation
Follow changes to semaphore initialisers per the commit below:
commit 632cf92a72fecda096d0f4608eaefb2c7392b744
Author: Thomas Gleixner <tglx@linutronix.de>
Date: Tue Sep 14 07:12:35 2010 -0400
mmc: Convert "mutex" to semaphore
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/iscsitarget/config.c | 2 | ||||
| -rw-r--r-- | ubuntu/iscsitarget/target.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/iscsitarget/config.c b/ubuntu/iscsitarget/config.c index 87fa44b9705..2146504f7a3 100644 --- a/ubuntu/iscsitarget/config.c +++ b/ubuntu/iscsitarget/config.c @@ -9,7 +9,7 @@ #include "iscsi.h" #include "iscsi_dbg.h" -static DECLARE_MUTEX(ioctl_sem); +static DEFINE_SEMAPHORE(ioctl_sem); struct proc_entries { const char *name; diff --git a/ubuntu/iscsitarget/target.c b/ubuntu/iscsitarget/target.c index 43326dcb712..9065d161de3 100644 --- a/ubuntu/iscsitarget/target.c +++ b/ubuntu/iscsitarget/target.c @@ -11,7 +11,7 @@ #define MAX_NR_TARGETS (1UL << 30) static LIST_HEAD(target_list); -static DECLARE_MUTEX(target_list_sem); +static DEFINE_SEMAPHORE(target_list_sem); static u32 next_target_id; static u32 nr_targets; @@ -157,7 +157,7 @@ static int iscsi_target_create(struct target_info *info, u32 tid) strncpy(target->name, name, sizeof(target->name) - 1); - init_MUTEX(&target->target_sem); + sema_init(&target->target_sem, 1); spin_lock_init(&target->session_list_lock); INIT_LIST_HEAD(&target->session_list); |