diff options
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 136af8a08f45..79eeccd0437f 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -874,9 +874,9 @@ static int cifs_oplock_thread(void * dummyarg) | |||
874 | DeleteOplockQEntry(oplock_item); | 874 | DeleteOplockQEntry(oplock_item); |
875 | /* can not grab inode sem here since it would | 875 | /* can not grab inode sem here since it would |
876 | deadlock when oplock received on delete | 876 | deadlock when oplock received on delete |
877 | since vfs_unlink holds the i_sem across | 877 | since vfs_unlink holds the i_mutex across |
878 | the call */ | 878 | the call */ |
879 | /* down(&inode->i_sem);*/ | 879 | /* mutex_lock(&inode->i_mutex);*/ |
880 | if (S_ISREG(inode->i_mode)) { | 880 | if (S_ISREG(inode->i_mode)) { |
881 | rc = filemap_fdatawrite(inode->i_mapping); | 881 | rc = filemap_fdatawrite(inode->i_mapping); |
882 | if(CIFS_I(inode)->clientCanCacheRead == 0) { | 882 | if(CIFS_I(inode)->clientCanCacheRead == 0) { |
@@ -885,7 +885,7 @@ static int cifs_oplock_thread(void * dummyarg) | |||
885 | } | 885 | } |
886 | } else | 886 | } else |
887 | rc = 0; | 887 | rc = 0; |
888 | /* up(&inode->i_sem);*/ | 888 | /* mutex_unlock(&inode->i_mutex);*/ |
889 | if (rc) | 889 | if (rc) |
890 | CIFS_I(inode)->write_behind_rc = rc; | 890 | CIFS_I(inode)->write_behind_rc = rc; |
891 | cFYI(1,("Oplock flush inode %p rc %d",inode,rc)); | 891 | cFYI(1,("Oplock flush inode %p rc %d",inode,rc)); |