FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-01 00:23:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jeff Layton 2017-07-06 07:02:22 -04:00
parent 87354e5de0
commit 76341cabbd
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/jbd2/commit.c
View File

@ -263,18 +263,10 @@ static int journal_finish_inode_data_buffers(journal_t *journal,
continue; continue;
jinode->i_flags |= JI_COMMIT_RUNNING; jinode->i_flags |= JI_COMMIT_RUNNING;
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
err = filemap_fdatawait(jinode->i_vfs_inode->i_mapping); err = filemap_fdatawait_keep_errors(
if (err) { jinode->i_vfs_inode->i_mapping);
/* if (!ret)
* Because AS_EIO is cleared by ret = err;
* 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;
}
spin_lock(&journal->j_list_lock); spin_lock(&journal->j_list_lock);
jinode->i_flags &= ~JI_COMMIT_RUNNING; jinode->i_flags &= ~JI_COMMIT_RUNNING;
smp_mb(); smp_mb();

2
include/linux/fs.h
View File

@ -2514,7 +2514,7 @@ extern int write_inode_now(struct inode *, int);
extern int filemap_fdatawrite(struct address_space *); extern int filemap_fdatawrite(struct address_space *);
extern int filemap_flush(struct address_space *); extern int filemap_flush(struct address_space *);
extern int filemap_fdatawait(struct address_space *); extern int filemap_fdatawait(struct address_space *);
extern void filemap_fdatawait_keep_errors(struct address_space *); extern int filemap_fdatawait_keep_errors(struct address_space *mapping);
extern int filemap_fdatawait_range(struct address_space *, loff_t lstart, extern int filemap_fdatawait_range(struct address_space *, loff_t lstart,
loff_t lend); loff_t lend);
extern int filemap_write_and_wait(struct address_space *mapping); extern int filemap_write_and_wait(struct address_space *mapping);

16
mm/filemap.c
View File

@ -309,6 +309,16 @@ int filemap_check_errors(struct address_space *mapping)
} }
EXPORT_SYMBOL(filemap_check_errors); EXPORT_SYMBOL(filemap_check_errors);
static int filemap_check_and_keep_errors(struct address_space *mapping)
{
/* Check for outstanding write errors */
if (test_bit(AS_EIO, &mapping->flags))
return -EIO;
if (test_bit(AS_ENOSPC, &mapping->flags))
return -ENOSPC;
return 0;
}
/** /**
* __filemap_fdatawrite_range - start writeback on mapping dirty pages in range * __filemap_fdatawrite_range - start writeback on mapping dirty pages in range
* @mapping: address space structure to write * @mapping: address space structure to write
@ -453,15 +463,17 @@ EXPORT_SYMBOL(filemap_fdatawait_range);
* call sites are system-wide / filesystem-wide data flushers: e.g. sync(2), * call sites are system-wide / filesystem-wide data flushers: e.g. sync(2),
* fsfreeze(8) * fsfreeze(8)
*/ */
void filemap_fdatawait_keep_errors(struct address_space *mapping) int filemap_fdatawait_keep_errors(struct address_space *mapping)
{ {
loff_t i_size = i_size_read(mapping->host); loff_t i_size = i_size_read(mapping->host);
if (i_size == 0) if (i_size == 0)
return; return 0;
__filemap_fdatawait_range(mapping, 0, i_size - 1); __filemap_fdatawait_range(mapping, 0, i_size - 1);
return filemap_check_and_keep_errors(mapping);
} }
EXPORT_SYMBOL(filemap_fdatawait_keep_errors);
/** /**
* filemap_fdatawait - wait for all under-writeback pages to complete * filemap_fdatawait - wait for all under-writeback pages to complete