Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

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)
                 }
         }
 
-        down(&inode->i_sb->s_vfs_rename_sem);
+        mutex_lock(&inode->i_sb->s_vfs_rename_mutex);
         full_path = build_path_from_dentry(file->f_dentry);
-        up(&inode->i_sb->s_vfs_rename_sem);
+        mutex_unlock(&inode->i_sb->s_vfs_rename_mutex);
         if (full_path == NULL) {
                 FreeXid(xid);
                 return -ENOMEM;
@@ -1377,7 +1377,7 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)
         return rc;
 }
 
-/* static int cifs_sync_page(struct page *page)
+/* static void cifs_sync_page(struct page *page)
 {
         struct address_space *mapping;
         struct inode *inode;
@@ -1391,16 +1391,18 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)
                 return 0;
         inode = mapping->host;
         if (!inode)
-                return 0; */
+                return; */
 
 /*      fill in rpages then 
         result = cifs_pagein_inode(inode, index, rpages); */ /* BB finish */
 
 /*      cFYI(1, ("rpages is %d for sync page of Index %ld ", rpages, index));
 
+#if 0
         if (rc < 0)
                 return rc;
         return 0;
+#endif
 } */
 
 /*