diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-07-23 07:53:29 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-08-12 18:17:51 -0400 |
| commit | 19e9745c69d66f0d8198d101a8dce0068387ad98 (patch) | |
| tree | a379380628b7c52d92763b15ce351ed7d74210a7 | |
| parent | ff6f957dd96e8064c3c4428d5e5df4fa12eab586 (diff) | |
bcachefs: minor fsync fix
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/fs-io.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c index 5deff5b1e14c..90a4c182e576 100644 --- a/fs/bcachefs/fs-io.c +++ b/fs/bcachefs/fs-io.c @@ -2079,7 +2079,7 @@ int bch2_fsync(struct file *file, loff_t start, loff_t end, int datasync) { struct bch_inode_info *inode = file_bch_inode(file); struct bch_fs *c = inode->v.i_sb->s_fs_info; - int ret; + int ret, ret2; ret = file_write_and_wait_range(file, start, end); if (ret) @@ -2095,7 +2095,10 @@ out: if (c->opts.journal_flush_disabled) return 0; - return bch2_journal_flush_seq(&c->journal, inode->ei_journal_seq); + ret = bch2_journal_flush_seq(&c->journal, inode->ei_journal_seq); + ret2 = file_check_and_advance_wb_err(file); + + return ret ?: ret2; } /* truncate: */ |