| Message ID | 20170509154930.29524-23-jlayton@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue 09-05-17 11:49:25, Jeff Layton wrote: > Now that we don't clear writeback errors after fetching them, there is > no need to reset them. This is also potentially racy. > > Signed-off-by: Jeff Layton <jlayton@redhat.com> Looks good. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/jbd2/commit.c | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c > index b6b194ec1b4f..4c6262652028 100644 > --- a/fs/jbd2/commit.c > +++ b/fs/jbd2/commit.c > @@ -264,17 +264,8 @@ static int journal_finish_inode_data_buffers(journal_t *journal, > 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; > - } > + if (err && !ret) > + ret = err; > spin_lock(&journal->j_list_lock); > jinode->i_flags &= ~JI_COMMIT_RUNNING; > smp_mb(); > -- > 2.9.3 > >
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index b6b194ec1b4f..4c6262652028 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -264,17 +264,8 @@ static int journal_finish_inode_data_buffers(journal_t *journal, 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; - } + if (err && !ret) + ret = err; spin_lock(&journal->j_list_lock); jinode->i_flags &= ~JI_COMMIT_RUNNING; smp_mb();
Now that we don't clear writeback errors after fetching them, there is no need to reset them. This is also potentially racy. Signed-off-by: Jeff Layton <jlayton@redhat.com> --- fs/jbd2/commit.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)