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>

diff --git a/ubuntu/iscsitarget/config.c b/ubuntu/iscsitarget/config.c
index 87fa44b..2146504 100644 (file)
--- 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 43326dc..9065d16 100644 (file)
--- 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);