From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sat, 21 Nov 2020 00:27:57 +0000 (-0500)
Subject: bcachefs: Optimize bch2_journal_flush_seq_async()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=33b3b1dc0f685b4542a631a0ca053380613829a6;p=linux.git

bcachefs: Optimize bch2_journal_flush_seq_async()

Avoid taking the journal lock if we don't have to.

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

diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c
index 27fcb378790b3..759a04346cdec 100644
--- a/fs/bcachefs/journal.c
+++ b/fs/bcachefs/journal.c
@@ -547,12 +547,20 @@ out:
  * necessary
  */
 int bch2_journal_flush_seq_async(struct journal *j, u64 seq,
-				  struct closure *parent)
+				 struct closure *parent)
 {
 	struct journal_buf *buf;
 	int ret = 0;
 
+	if (seq <= j->err_seq)
+		return -EIO;
+
+	if (seq <= j->seq_ondisk)
+		return 1;
+
 	spin_lock(&j->lock);
+
+	/* Recheck under lock: */
 	if (seq <= j->err_seq) {
 		ret = -EIO;
 		goto out;