aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/capi/capifs.c
diff options
context:
space:
mode:
authorJes Sorensen <jes@sgi.com>2006-01-09 18:59:24 -0500
committerIngo Molnar <mingo@hera.kernel.org>2006-01-09 18:59:24 -0500
commit1b1dcc1b57a49136f118a0f16367256ff9994a69 (patch)
treeb0b36d4f41d28c9d6514fb309d33c1a084d6309b /drivers/isdn/capi/capifs.c
parent794ee1baee1c26be40410233e6c20bceb2b03c08 (diff)
[PATCH] mutex subsystem, semaphore to mutex: VFS, ->i_sem
This patch converts the inode semaphore to a mutex. I have tested it on XFS and compiled as much as one can consider on an ia64. Anyway your luck with it might be different. Modified-by: Ingo Molnar <mingo@elte.hu> (finished the conversion) Signed-off-by: Jes Sorensen <jes@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/isdn/capi/capifs.c')
-rw-r--r--drivers/isdn/capi/capifs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 207cae366256..0a37aded4b54 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -138,7 +138,7 @@ static struct dentry *get_node(int num)
138{ 138{
139 char s[10]; 139 char s[10];
140 struct dentry *root = capifs_root; 140 struct dentry *root = capifs_root;
141 down(&root->d_inode->i_sem); 141 mutex_lock(&root->d_inode->i_mutex);
142 return lookup_one_len(s, root, sprintf(s, "%d", num)); 142 return lookup_one_len(s, root, sprintf(s, "%d", num));
143} 143}
144 144
@@ -159,7 +159,7 @@ void capifs_new_ncci(unsigned int number, dev_t device)
159 dentry = get_node(number); 159 dentry = get_node(number);
160 if (!IS_ERR(dentry) && !dentry->d_inode) 160 if (!IS_ERR(dentry) && !dentry->d_inode)
161 d_instantiate(dentry, inode); 161 d_instantiate(dentry, inode);
162 up(&capifs_root->d_inode->i_sem); 162 mutex_unlock(&capifs_root->d_inode->i_mutex);
163} 163}
164 164
165void capifs_free_ncci(unsigned int number) 165void capifs_free_ncci(unsigned int number)
@@ -175,7 +175,7 @@ void capifs_free_ncci(unsigned int number)
175 } 175 }
176 dput(dentry); 176 dput(dentry);
177 } 177 }
178 up(&capifs_root->d_inode->i_sem); 178 mutex_unlock(&capifs_root->d_inode->i_mutex);
179} 179}
180 180
181static int __init capifs_init(void) 181static int __init capifs_init(void)