Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[sfrench/cifs-2.6.git] / fs / libfs.c

diff --git a/fs/libfs.c b/fs/libfs.c
index a04395334bb156ae04853639650dc9751fb55753..3aabe553fc4500a864459bb08f520dd820c94420 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -974,7 +974,7 @@ int __generic_file_fsync(struct file *file, loff_t start, loff_t end,
        int err;
        int ret;
 
-       err = filemap_write_and_wait_range(inode->i_mapping, start, end);
+       err = file_write_and_wait_range(file, start, end);
        if (err)
                return err;
 
@@ -991,6 +991,10 @@ int __generic_file_fsync(struct file *file, loff_t start, loff_t end,
 
 out:
        inode_unlock(inode);
+       /* check and advance again to catch errors after syncing out buffers */
+       err = file_check_and_advance_wb_err(file);
+       if (ret == 0)
+               ret = err;
        return ret;
 }
 EXPORT_SYMBOL(__generic_file_fsync);