X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libbcachefs%2Fjournal.h;h=008a2e25a4fac93df681233b679c9fc6eaca95d0;hb=ded0160563b045b61e79949f07bed903e98b6528;hp=ee37f90aa6b369097170d85ea2b3fe35c69d56ea;hpb=71111771690f244d13650c73d52ff601ad914d95;p=bcachefs-tools-debian

diff --git a/libbcachefs/journal.h b/libbcachefs/journal.h
index ee37f90..008a2e2 100644
--- a/libbcachefs/journal.h
+++ b/libbcachefs/journal.h
@@ -110,7 +110,6 @@
  */
 
 #include <linux/hash.h>
-#include <linux/prefetch.h>
 
 #include "journal_types.h"
 
@@ -295,9 +294,14 @@ static inline void bch2_journal_res_put(struct journal *j,
 int bch2_journal_res_get_slowpath(struct journal *, struct journal_res *,
 				  unsigned);
 
-/* First two bits for JOURNAL_WATERMARK: */
-#define JOURNAL_RES_GET_NONBLOCK	(1 << 2)
-#define JOURNAL_RES_GET_CHECK		(1 << 3)
+/* First bits for BCH_WATERMARK: */
+enum journal_res_flags {
+	__JOURNAL_RES_GET_NONBLOCK	= BCH_WATERMARK_BITS,
+	__JOURNAL_RES_GET_CHECK,
+};
+
+#define JOURNAL_RES_GET_NONBLOCK	(1 << __JOURNAL_RES_GET_NONBLOCK)
+#define JOURNAL_RES_GET_CHECK		(1 << __JOURNAL_RES_GET_CHECK)
 
 static inline int journal_res_get_fast(struct journal *j,
 				       struct journal_res *res,
@@ -305,34 +309,23 @@ static inline int journal_res_get_fast(struct journal *j,
 {
 	union journal_res_state old, new;
 	u64 v = atomic64_read(&j->reservations.counter);
-	unsigned u64s, offset;
 
 	do {
 		old.v = new.v = v;
 
-		/*
-		 * Round up the end of the journal reservation to the next
-		 * cacheline boundary:
-		 */
-		u64s = res->u64s;
-		offset = sizeof(struct jset) / sizeof(u64) +
-			  new.cur_entry_offset + u64s;
-		u64s += ((offset - 1) & ((SMP_CACHE_BYTES / sizeof(u64)) - 1)) + 1;
-
-
 		/*
 		 * Check if there is still room in the current journal
 		 * entry:
 		 */
-		if (new.cur_entry_offset + u64s > j->cur_entry_u64s)
+		if (new.cur_entry_offset + res->u64s > j->cur_entry_u64s)
 			return 0;
 
 		EBUG_ON(!journal_state_count(new, new.idx));
 
-		if ((flags & JOURNAL_WATERMARK_MASK) < j->watermark)
+		if ((flags & BCH_WATERMARK_MASK) < j->watermark)
 			return 0;
 
-		new.cur_entry_offset += u64s;
+		new.cur_entry_offset += res->u64s;
 		journal_state_inc(&new);
 
 		/*
@@ -349,15 +342,8 @@ static inline int journal_res_get_fast(struct journal *j,
 
 	res->ref	= true;
 	res->idx	= old.idx;
-	res->u64s	= u64s;
 	res->offset	= old.cur_entry_offset;
 	res->seq	= le64_to_cpu(j->buf[old.idx].data->seq);
-
-	offset = res->offset;
-	while (offset < res->offset + res->u64s) {
-		prefetchw(vstruct_idx(j->buf[res->idx].data, offset));
-		offset += SMP_CACHE_BYTES / sizeof(u64);
-	}
 	return 1;
 }
 
@@ -392,17 +378,17 @@ out:
 static inline void journal_set_watermark(struct journal *j)
 {
 	union journal_preres_state s = READ_ONCE(j->prereserved);
-	unsigned watermark = JOURNAL_WATERMARK_any;
+	unsigned watermark = BCH_WATERMARK_stripe;
 
 	if (fifo_free(&j->pin) < j->pin.size / 4)
-		watermark = max_t(unsigned, watermark, JOURNAL_WATERMARK_copygc);
+		watermark = max_t(unsigned, watermark, BCH_WATERMARK_copygc);
 	if (fifo_free(&j->pin) < j->pin.size / 8)
-		watermark = max_t(unsigned, watermark, JOURNAL_WATERMARK_reserved);
+		watermark = max_t(unsigned, watermark, BCH_WATERMARK_reclaim);
 
 	if (s.reserved > s.remaining)
-		watermark = max_t(unsigned, watermark, JOURNAL_WATERMARK_copygc);
+		watermark = max_t(unsigned, watermark, BCH_WATERMARK_copygc);
 	if (!s.remaining)
-		watermark = max_t(unsigned, watermark, JOURNAL_WATERMARK_reserved);
+		watermark = max_t(unsigned, watermark, BCH_WATERMARK_reclaim);
 
 	if (watermark == j->watermark)
 		return;
@@ -445,13 +431,14 @@ static inline int bch2_journal_preres_get_fast(struct journal *j,
 	int d = new_u64s - res->u64s;
 	union journal_preres_state old, new;
 	u64 v = atomic64_read(&j->prereserved.counter);
+	enum bch_watermark watermark = flags & BCH_WATERMARK_MASK;
 	int ret;
 
 	do {
 		old.v = new.v = v;
 		ret = 0;
 
-		if ((flags & JOURNAL_WATERMARK_reserved) ||
+		if (watermark == BCH_WATERMARK_reclaim ||
 		    new.reserved + d < new.remaining) {
 			new.reserved += d;
 			ret = 1;