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 /mm/filemap_xip.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 'mm/filemap_xip.c')
-rw-r--r-- | mm/filemap_xip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c index 9cf687e4a29a..e2b34e95913e 100644 --- a/mm/filemap_xip.c +++ b/mm/filemap_xip.c | |||
@@ -338,7 +338,7 @@ __xip_file_write(struct file *filp, const char __user *buf, | |||
338 | *ppos = pos; | 338 | *ppos = pos; |
339 | /* | 339 | /* |
340 | * No need to use i_size_read() here, the i_size | 340 | * No need to use i_size_read() here, the i_size |
341 | * cannot change under us because we hold i_sem. | 341 | * cannot change under us because we hold i_mutex. |
342 | */ | 342 | */ |
343 | if (pos > inode->i_size) { | 343 | if (pos > inode->i_size) { |
344 | i_size_write(inode, pos); | 344 | i_size_write(inode, pos); |
@@ -358,7 +358,7 @@ xip_file_write(struct file *filp, const char __user *buf, size_t len, | |||
358 | loff_t pos; | 358 | loff_t pos; |
359 | ssize_t ret; | 359 | ssize_t ret; |
360 | 360 | ||
361 | down(&inode->i_sem); | 361 | mutex_lock(&inode->i_mutex); |
362 | 362 | ||
363 | if (!access_ok(VERIFY_READ, buf, len)) { | 363 | if (!access_ok(VERIFY_READ, buf, len)) { |
364 | ret=-EFAULT; | 364 | ret=-EFAULT; |
@@ -390,7 +390,7 @@ xip_file_write(struct file *filp, const char __user *buf, size_t len, | |||
390 | out_backing: | 390 | out_backing: |
391 | current->backing_dev_info = NULL; | 391 | current->backing_dev_info = NULL; |
392 | out_up: | 392 | out_up: |
393 | up(&inode->i_sem); | 393 | mutex_unlock(&inode->i_mutex); |
394 | return ret; | 394 | return ret; |
395 | } | 395 | } |
396 | EXPORT_SYMBOL_GPL(xip_file_write); | 396 | EXPORT_SYMBOL_GPL(xip_file_write); |