diff options
| author | Jes Sorensen <jes@sgi.com> | 2006-01-09 15:59:24 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@hera.kernel.org> | 2006-01-09 15:59:24 -0800 |
| commit | 1b1dcc1b57a49136f118a0f16367256ff9994a69 (patch) | |
| tree | b0b36d4f41d28c9d6514fb309d33c1a084d6309b /fs/fifo.c | |
| parent | 794ee1baee1c26be40410233e6c20bceb2b03c08 (diff) | |
| download | lwn-1b1dcc1b57a49136f118a0f16367256ff9994a69.tar.gz lwn-1b1dcc1b57a49136f118a0f16367256ff9994a69.zip | |
[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
diff --git a/fs/fifo.c b/fs/fifo.c index 5455916241f0..923371b753ab 100644 --- a/fs/fifo.c +++ b/fs/fifo.c @@ -35,7 +35,7 @@ static int fifo_open(struct inode *inode, struct file *filp) int ret; ret = -ERESTARTSYS; - if (down_interruptible(PIPE_SEM(*inode))) + if (mutex_lock_interruptible(PIPE_MUTEX(*inode))) goto err_nolock_nocleanup; if (!inode->i_pipe) { @@ -119,7 +119,7 @@ static int fifo_open(struct inode *inode, struct file *filp) } /* Ok! */ - up(PIPE_SEM(*inode)); + mutex_unlock(PIPE_MUTEX(*inode)); return 0; err_rd: @@ -139,7 +139,7 @@ err: free_pipe_info(inode); err_nocleanup: - up(PIPE_SEM(*inode)); + mutex_unlock(PIPE_MUTEX(*inode)); err_nolock_nocleanup: return ret; |