2 files changed, 4 insertions, 5 deletions

diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index b21891a6bfca..d34d32bdc944 100644
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -174,15 +174,12 @@ int ext2_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
         int ret;
         struct super_block *sb = file->f_mapping->host->i_sb;
-        struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping;
 
         ret = generic_file_fsync(file, start, end, datasync);
-        if (ret == -EIO || test_and_clear_bit(AS_EIO, &mapping->flags)) {
+        if (ret == -EIO)
                 /* We don't really know where the IO error happened... */
                 ext2_error(sb, __func__,
                            "detected IO error when writing metadata buffers");
-                ret = -EIO;
-        }
         return ret;
 }
 
diff --git a/fs/libfs.c b/fs/libfs.c
index a04395334bb1..1b76f29799bf 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -991,7 +991,9 @@ int __generic_file_fsync(struct file *file, loff_t start, loff_t end,
 
 out:
         inode_unlock(inode);
-        return ret;
+        /* must call this unconditionally as it clears AS_* error flags */
+        err = filemap_check_errors(inode->i_mapping);
+        return ret ? ret : err;
 }
 EXPORT_SYMBOL(__generic_file_fsync);