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/fat | |
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/fat')
-rw-r--r-- | fs/fat/dir.c | 4 | ||||
-rw-r--r-- | fs/fat/file.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/fat/dir.c b/fs/fat/dir.c index eef1b81aa294..db0de5c621c7 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c | |||
@@ -729,13 +729,13 @@ static int fat_dir_ioctl(struct inode * inode, struct file * filp, | |||
729 | 729 | ||
730 | buf.dirent = d1; | 730 | buf.dirent = d1; |
731 | buf.result = 0; | 731 | buf.result = 0; |
732 | down(&inode->i_sem); | 732 | mutex_lock(&inode->i_mutex); |
733 | ret = -ENOENT; | 733 | ret = -ENOENT; |
734 | if (!IS_DEADDIR(inode)) { | 734 | if (!IS_DEADDIR(inode)) { |
735 | ret = __fat_readdir(inode, filp, &buf, fat_ioctl_filldir, | 735 | ret = __fat_readdir(inode, filp, &buf, fat_ioctl_filldir, |
736 | short_only, both); | 736 | short_only, both); |
737 | } | 737 | } |
738 | up(&inode->i_sem); | 738 | mutex_unlock(&inode->i_mutex); |
739 | if (ret >= 0) | 739 | if (ret >= 0) |
740 | ret = buf.result; | 740 | ret = buf.result; |
741 | return ret; | 741 | return ret; |
diff --git a/fs/fat/file.c b/fs/fat/file.c index 9b07c328a6fc..d30876cf35f5 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c | |||
@@ -41,7 +41,7 @@ int fat_generic_ioctl(struct inode *inode, struct file *filp, | |||
41 | if (err) | 41 | if (err) |
42 | return err; | 42 | return err; |
43 | 43 | ||
44 | down(&inode->i_sem); | 44 | mutex_lock(&inode->i_mutex); |
45 | 45 | ||
46 | if (IS_RDONLY(inode)) { | 46 | if (IS_RDONLY(inode)) { |
47 | err = -EROFS; | 47 | err = -EROFS; |
@@ -103,7 +103,7 @@ int fat_generic_ioctl(struct inode *inode, struct file *filp, | |||
103 | MSDOS_I(inode)->i_attrs = attr & ATTR_UNUSED; | 103 | MSDOS_I(inode)->i_attrs = attr & ATTR_UNUSED; |
104 | mark_inode_dirty(inode); | 104 | mark_inode_dirty(inode); |
105 | up: | 105 | up: |
106 | up(&inode->i_sem); | 106 | mutex_unlock(&inode->i_mutex); |
107 | return err; | 107 | return err; |
108 | } | 108 | } |
109 | default: | 109 | default: |