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/cifs/cifsfs.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/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 2a13a2bac8f1..e10213b7541e 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -860,9 +860,9 @@ static int cifs_oplock_thread(void * dummyarg) | |||
860 | DeleteOplockQEntry(oplock_item); | 860 | DeleteOplockQEntry(oplock_item); |
861 | /* can not grab inode sem here since it would | 861 | /* can not grab inode sem here since it would |
862 | deadlock when oplock received on delete | 862 | deadlock when oplock received on delete |
863 | since vfs_unlink holds the i_sem across | 863 | since vfs_unlink holds the i_mutex across |
864 | the call */ | 864 | the call */ |
865 | /* down(&inode->i_sem);*/ | 865 | /* mutex_lock(&inode->i_mutex);*/ |
866 | if (S_ISREG(inode->i_mode)) { | 866 | if (S_ISREG(inode->i_mode)) { |
867 | rc = filemap_fdatawrite(inode->i_mapping); | 867 | rc = filemap_fdatawrite(inode->i_mapping); |
868 | if(CIFS_I(inode)->clientCanCacheRead == 0) { | 868 | if(CIFS_I(inode)->clientCanCacheRead == 0) { |
@@ -871,7 +871,7 @@ static int cifs_oplock_thread(void * dummyarg) | |||
871 | } | 871 | } |
872 | } else | 872 | } else |
873 | rc = 0; | 873 | rc = 0; |
874 | /* up(&inode->i_sem);*/ | 874 | /* mutex_unlock(&inode->i_mutex);*/ |
875 | if (rc) | 875 | if (rc) |
876 | CIFS_I(inode)->write_behind_rc = rc; | 876 | CIFS_I(inode)->write_behind_rc = rc; |
877 | cFYI(1,("Oplock flush inode %p rc %d",inode,rc)); | 877 | cFYI(1,("Oplock flush inode %p rc %d",inode,rc)); |