diff options
author | Jes Sorensen <jes@sgi.com> | 2006-01-09 18:59:24 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@hera.kernel.org> | 2006-01-09 18:59:24 -0500 |
commit | 1b1dcc1b57a49136f118a0f16367256ff9994a69 (patch) | |
tree | b0b36d4f41d28c9d6514fb309d33c1a084d6309b /fs/fifo.c | |
parent | 794ee1baee1c26be40410233e6c20bceb2b03c08 (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 'fs/fifo.c')
-rw-r--r-- | fs/fifo.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -35,7 +35,7 @@ static int fifo_open(struct inode *inode, struct file *filp) | |||
35 | int ret; | 35 | int ret; |
36 | 36 | ||
37 | ret = -ERESTARTSYS; | 37 | ret = -ERESTARTSYS; |
38 | if (down_interruptible(PIPE_SEM(*inode))) | 38 | if (mutex_lock_interruptible(PIPE_MUTEX(*inode))) |
39 | goto err_nolock_nocleanup; | 39 | goto err_nolock_nocleanup; |
40 | 40 | ||
41 | if (!inode->i_pipe) { | 41 | if (!inode->i_pipe) { |
@@ -119,7 +119,7 @@ static int fifo_open(struct inode *inode, struct file *filp) | |||
119 | } | 119 | } |
120 | 120 | ||
121 | /* Ok! */ | 121 | /* Ok! */ |
122 | up(PIPE_SEM(*inode)); | 122 | mutex_unlock(PIPE_MUTEX(*inode)); |
123 | return 0; | 123 | return 0; |
124 | 124 | ||
125 | err_rd: | 125 | err_rd: |
@@ -139,7 +139,7 @@ err: | |||
139 | free_pipe_info(inode); | 139 | free_pipe_info(inode); |
140 | 140 | ||
141 | err_nocleanup: | 141 | err_nocleanup: |
142 | up(PIPE_SEM(*inode)); | 142 | mutex_unlock(PIPE_MUTEX(*inode)); |
143 | 143 | ||
144 | err_nolock_nocleanup: | 144 | err_nolock_nocleanup: |
145 | return ret; | 145 | return ret; |