bcachefs: minor fsync fix

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c
index ed028b5..cc99eb1 100644 (file)
--- a/fs/bcachefs/fs-io.c
+++ b/fs/bcachefs/fs-io.c
@@ -2107,7 +2107,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)
@@ -2123,7 +2123,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: */