bcachefs: Don't flush journal from bch2_vfs_write_inode()
authorKent Overstreet <kent.overstreet@gmail.com>
Thu, 22 Aug 2019 20:30:55 +0000 (16:30 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:08:25 +0000 (17:08 -0400)
It's only updating timestamps, so this doubly doesn't make sense. fsync
will flush the journal, if necessary.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/fs.c

index fad019d3c3f583d78a9d69e920a970ff1de9e569..c4ef172400e1d33c689a952ef5e53b67b278f276 100644 (file)
@@ -1533,12 +1533,6 @@ static int bch2_vfs_write_inode(struct inode *vinode,
                               ATTR_ATIME|ATTR_MTIME|ATTR_CTIME);
        mutex_unlock(&inode->ei_update_lock);
 
-       if (c->opts.journal_flush_disabled)
-               return ret;
-
-       if (!ret && wbc->sync_mode == WB_SYNC_ALL)
-               ret = bch2_journal_flush_seq(&c->journal, inode->ei_journal_seq);
-
        return ret;
 }
 
@@ -1595,6 +1589,9 @@ static int bch2_sync_fs(struct super_block *sb, int wait)
 {
        struct bch_fs *c = sb->s_fs_info;
 
+       if (c->opts.journal_flush_disabled)
+               return 0;
+
        if (!wait) {
                bch2_journal_flush_async(&c->journal, NULL);
                return 0;