vserver 1.9.5.x5

[linux-2.6.git] / fs / smbfs / smbiod.c

diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c
index 6d8b287..481a97a 100644 (file)
--- a/fs/smbfs/smbiod.c
+++ b/fs/smbfs/smbiod.c
@@ -43,7 +43,7 @@ static enum smbiod_state smbiod_state = SMBIOD_DEAD;
 static pid_t smbiod_pid;
 static DECLARE_WAIT_QUEUE_HEAD(smbiod_wait);
 static LIST_HEAD(smb_servers);
-static spinlock_t servers_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(servers_lock);
 
 #define SMBIOD_DATA_READY      (1<<0)
 static long smbiod_flags;
@@ -65,7 +65,7 @@ void smbiod_wake_up(void)
 /*
  * start smbiod if none is running
  */
-static int smbiod_start()
+static int smbiod_start(void)
 {
        pid_t pid;
        if (smbiod_state != SMBIOD_DEAD)