summaryrefslogtreecommitdiffstats
path: root/fs/bcachefs/fs.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-08-22 22:30:55 +0200
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-22 23:08:25 +0200
commit416f6852523d8599713b756b2d2027d2e9f90b3f (patch)
treeaf131688e62982fe7573fe41f45853d3090044ee /fs/bcachefs/fs.c
parentbcachefs: Fix a spurious gcc warning (diff)
downloadlinux-416f6852523d8599713b756b2d2027d2e9f90b3f.tar.xz
linux-416f6852523d8599713b756b2d2027d2e9f90b3f.zip
bcachefs: Don't flush journal from bch2_vfs_write_inode()
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>
Diffstat (limited to '')
-rw-r--r--fs/bcachefs/fs.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index fad019d3c3f5..c4ef172400e1 100644
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -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;