From 42e087f9aee9050681ea7c756eac5d2ed32bb23a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 25 Jul 2009 23:12:40 +0200 Subject: [PATCH] smbfs: Convert server->sem to mutex commit 4904cd2a7a826a2d4751ee9687a9c32cdabe1a28 in tip. server->sem is used as mutex so make it a mutex. Signed-off-by: Thomas Gleixner Cc: Al Viro Signed-off-by: Paul Gortmaker --- fs/smbfs/inode.c | 2 +- include/linux/smb_fs_sb.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index dfa1d67..90805c6 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c @@ -536,7 +536,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent) server->mnt = NULL; server->sock_file = NULL; init_waitqueue_head(&server->conn_wq); - init_MUTEX(&server->sem); + mutex_init(&server->mutex); INIT_LIST_HEAD(&server->entry); INIT_LIST_HEAD(&server->xmitq); INIT_LIST_HEAD(&server->recvq); diff --git a/include/linux/smb_fs_sb.h b/include/linux/smb_fs_sb.h index bb947dd..af5db58 100644 --- a/include/linux/smb_fs_sb.h +++ b/include/linux/smb_fs_sb.h @@ -58,7 +58,7 @@ struct smb_sb_info { struct smb_conn_opt opt; wait_queue_head_t conn_wq; int conn_complete; - struct semaphore sem; + struct mutex mutex; unsigned char header[SMB_HEADER_LEN + 20*2 + 2]; u32 header_len; @@ -82,19 +82,19 @@ struct smb_sb_info { static inline int smb_lock_server_interruptible(struct smb_sb_info *server) { - return down_interruptible(&(server->sem)); + return mutex_lock_interruptible(&server->mutex); } static inline void smb_lock_server(struct smb_sb_info *server) { - down(&(server->sem)); + mutex_lock(&server->mutex); } static inline void smb_unlock_server(struct smb_sb_info *server) { - up(&(server->sem)); + mutex_unlock(&server->mutex); } #endif -- 1.7.0.4