aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r--fs/cifs/file.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 2c093de26225..5c497c529772 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -203,9 +203,9 @@ int cifs_open(struct inode *inode, struct file *file)
203 } 203 }
204 } 204 }
205 205
206 down(&inode->i_sb->s_vfs_rename_sem); 206 mutex_lock(&inode->i_sb->s_vfs_rename_mutex);
207 full_path = build_path_from_dentry(file->f_dentry); 207 full_path = build_path_from_dentry(file->f_dentry);
208 up(&inode->i_sb->s_vfs_rename_sem); 208 mutex_unlock(&inode->i_sb->s_vfs_rename_mutex);
209 if (full_path == NULL) { 209 if (full_path == NULL) {
210 FreeXid(xid); 210 FreeXid(xid);
211 return -ENOMEM; 211 return -ENOMEM;
@@ -1377,7 +1377,7 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)
1377 return rc; 1377 return rc;
1378} 1378}
1379 1379
1380/* static int cifs_sync_page(struct page *page) 1380/* static void cifs_sync_page(struct page *page)
1381{ 1381{
1382 struct address_space *mapping; 1382 struct address_space *mapping;
1383 struct inode *inode; 1383 struct inode *inode;
@@ -1391,16 +1391,18 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)
1391 return 0; 1391 return 0;
1392 inode = mapping->host; 1392 inode = mapping->host;
1393 if (!inode) 1393 if (!inode)
1394 return 0; */ 1394 return; */
1395 1395
1396/* fill in rpages then 1396/* fill in rpages then
1397 result = cifs_pagein_inode(inode, index, rpages); */ /* BB finish */ 1397 result = cifs_pagein_inode(inode, index, rpages); */ /* BB finish */
1398 1398
1399/* cFYI(1, ("rpages is %d for sync page of Index %ld ", rpages, index)); 1399/* cFYI(1, ("rpages is %d for sync page of Index %ld ", rpages, index));
1400 1400
1401#if 0
1401 if (rc < 0) 1402 if (rc < 0)
1402 return rc; 1403 return rc;
1403 return 0; 1404 return 0;
1405#endif
1404} */ 1406} */
1405 1407
1406/* 1408/*