diff options
| author | Jeff Layton <jlayton@redhat.com> | 2017-07-06 07:02:22 -0400 |
|---|---|---|
| committer | Jeff Layton <jlayton@redhat.com> | 2017-07-06 07:02:22 -0400 |
| commit | 76341cabbdad65c10a4162e9dfa82a6342afc02f (patch) | |
| tree | 92413633a5fc6554fecd37842a4bcfd06fde0adb /fs/jbd2 | |
| parent | 87354e5de04fe727227ff619af164202adcfa4d4 (diff) | |
| download | linux-stable-76341cabbdad65c10a4162e9dfa82a6342afc02f.tar.gz linux-stable-76341cabbdad65c10a4162e9dfa82a6342afc02f.tar.bz2 linux-stable-76341cabbdad65c10a4162e9dfa82a6342afc02f.zip | |
jbd2: don't clear and reset errors after waiting on writeback
Resetting this flag is almost certainly racy, and will be problematic
with some coming changes.
Make filemap_fdatawait_keep_errors return int, but not clear the flag(s).
Have jbd2 call it instead of filemap_fdatawait and don't attempt to
re-set the error flag if it fails.
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/commit.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index b6b194ec1b4f..3c1c31321d9b 100644 --- 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(); |