From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Thu, 22 Aug 2019 20:30:55 +0000 (-0400)
Subject: bcachefs: Don't flush journal from bch2_vfs_write_inode()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=416f6852523d8599713b756b2d2027d2e9f90b3f;p=linux.git

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>
---

diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index fad019d3c3f58..c4ef172400e1d 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;