summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/bcachefs/fs-io.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c
index a3504b19c908..395328b44ccc 100644
--- a/fs/bcachefs/fs-io.c
+++ b/fs/bcachefs/fs-io.c
@@ -2090,7 +2090,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)
@@ -2106,7 +2106,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: */