Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 3 insertions, 4 deletions

diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c
index b4fcfa8b55a1..7042e62726a4 100644
--- a/fs/smbfs/file.c
+++ b/fs/smbfs/file.c
@@ -209,8 +209,8 @@ smb_updatepage(struct file *file, struct page *page, unsigned long offset,
 {
         struct dentry *dentry = file->f_dentry;
 
-        DEBUG1("(%s/%s %d@%ld)\n", DENTRY_PATH(dentry), 
-               count, (page->index << PAGE_CACHE_SHIFT)+offset);
+        DEBUG1("(%s/%s %d@%lld)\n", DENTRY_PATH(dentry), count,
+                ((unsigned long long)page->index << PAGE_CACHE_SHIFT) + offset);
 
         return smb_writepage_sync(dentry->d_inode, page, offset, count);
 }
@@ -374,8 +374,7 @@ smb_file_release(struct inode *inode, struct file * file)
                 /* We must flush any dirty pages now as we won't be able to
                    write anything after close. mmap can trigger this.
                    "openers" should perhaps include mmap'ers ... */
-                filemap_fdatawrite(inode->i_mapping);
-                filemap_fdatawait(inode->i_mapping);
+                filemap_write_and_wait(inode->i_mapping);
                 smb_close(inode);
         }
         unlock_kernel();