jbd2: don't clear and reset errors after waiting on writeback

[linux.git] / fs / jbd2 / commit.c

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index b6b194ec1b4f9afbb4b9ced950d03ac0018aaa35..3c1c31321d9bdde030191cae31cadd9856d597fe 100644 (file)
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -263,18 +263,10 @@ static int journal_finish_inode_data_buffers(journal_t *journal,
                        continue;
                jinode->i_flags |= JI_COMMIT_RUNNING;
                spin_unlock(&journal->j_list_lock);
-               err = filemap_fdatawait(jinode->i_vfs_inode->i_mapping);
-               if (err) {
-                       /*
-                        * Because AS_EIO is cleared by
-                        * filemap_fdatawait_range(), set it again so
-                        * that user process can get -EIO from fsync().
-                        */
-                       mapping_set_error(jinode->i_vfs_inode->i_mapping, -EIO);
-
-                       if (!ret)
-                               ret = err;
-               }
+               err = filemap_fdatawait_keep_errors(
+                               jinode->i_vfs_inode->i_mapping);
+               if (!ret)
+                       ret = err;
                spin_lock(&journal->j_list_lock);
                jinode->i_flags &= ~JI_COMMIT_RUNNING;
                smp_mb();