5 files changed, 30 insertions, 14 deletions

diff --git a/include/linux/atomic.h b/include/linux/atomic.h
index 38a364c0..a9852fa1 100644
--- a/include/linux/atomic.h
+++ b/include/linux/atomic.h
@@ -54,6 +54,8 @@ typedef struct {
 #define __ATOMIC_ADD_RETURN_RELEASE(v, p)				\
 					__atomic_add_fetch(p, v, __ATOMIC_RELEASE)
 #define __ATOMIC_SUB_RETURN(v, p)	__atomic_sub_fetch(p, v, __ATOMIC_RELAXED)
+#define __ATOMIC_SUB_RETURN_RELEASE(v, p)				\
+					__atomic_sub_fetch(p, v, __ATOMIC_RELEASE)
 
 #define xchg(p, v)			__atomic_exchange_n(p, v, __ATOMIC_SEQ_CST)
 #define xchg_acquire(p, v)		__atomic_exchange_n(p, v, __ATOMIC_ACQUIRE)
@@ -123,6 +125,11 @@ do {									\
 	({ smp_mb__before_atomic(); __ATOMIC_ADD_RETURN(i, v); })
 #endif
 
+#ifndef __ATOMIC_SUB_RETURN_RELEASE
+#define __ATOMIC_SUB_RETURN_RELEASE(i, v)				\
+	({ smp_mb__before_atomic(); __ATOMIC_SUB_RETURN(i, v); })
+#endif
+
 #ifndef __ATOMIC_SUB
 #define __ATOMIC_SUB(i, v) __ATOMIC_SUB_RETURN(i, v)
 #endif
@@ -164,6 +171,11 @@ static inline i_type a_type##_add_return_release(i_type i, a_type##_t *v)\
 	return __ATOMIC_ADD_RETURN_RELEASE(i, &v->counter);		\
 }									\
 									\
+static inline i_type a_type##_sub_return_release(i_type i, a_type##_t *v)\
+{									\
+	return __ATOMIC_SUB_RETURN_RELEASE(i, &v->counter);		\
+}									\
+									\
 static inline i_type a_type##_sub_return(i_type i, a_type##_t *v)	\
 {									\
 	return __ATOMIC_SUB_RETURN(i, &v->counter);			\
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index d31b5f56..b2c1751c 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -229,6 +229,8 @@ static inline int __must_check kstrtos32(const char *s, unsigned int base, s32 *
 }
 
 struct printbuf;
+extern void prt_u64(struct printbuf *out, u64 num);
+
 extern __printf(2, 0) void prt_vprintf(struct printbuf *out, const char *fmt, va_list args);
 extern __printf(2, 3) void prt_printf(struct printbuf *out, const char *fmt, ...);
 
diff --git a/include/linux/mean_and_variance.h b/include/linux/mean_and_variance.h
index 3d62abe7..cbac6ac8 100644
--- a/include/linux/mean_and_variance.h
+++ b/include/linux/mean_and_variance.h
@@ -155,7 +155,7 @@ struct mean_and_variance_weighted {
 	u64 variance;
 };
 
-inline s64 fast_divpow2(s64 n, u8 d);
+s64 fast_divpow2(s64 n, u8 d);
 
 struct mean_and_variance mean_and_variance_update(struct mean_and_variance s1, s64 v1);
        s64		 mean_and_variance_get_mean(struct mean_and_variance s);
diff --git a/include/linux/wait.h b/include/linux/wait.h
index d1d33e67..d30fb10d 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -24,6 +24,7 @@ typedef struct {
 } wait_queue_head_t;
 
 void wake_up(wait_queue_head_t *);
+void wake_up_all(wait_queue_head_t *);
 void prepare_to_wait(wait_queue_head_t *q, wait_queue_t *wait, int state);
 void finish_wait(wait_queue_head_t *q, wait_queue_t *wait);
 int autoremove_wake_function(wait_queue_t *wait, unsigned mode, int sync, void *key);
diff --git a/include/trace/events/bcachefs.h b/include/trace/events/bcachefs.h
index 444f43f0..47ba750d 100644
--- a/include/trace/events/bcachefs.h
+++ b/include/trace/events/bcachefs.h
@@ -344,25 +344,29 @@ DEFINE_EVENT(btree_node, btree_node_free,
 TRACE_EVENT(btree_reserve_get_fail,
 	TP_PROTO(const char *trans_fn,
 		 unsigned long caller_ip,
-		 size_t required),
-	TP_ARGS(trans_fn, caller_ip, required),
+		 size_t required,
+		 int ret),
+	TP_ARGS(trans_fn, caller_ip, required, ret),
 
 	TP_STRUCT__entry(
 		__array(char,			trans_fn, 32	)
 		__field(unsigned long,		caller_ip	)
 		__field(size_t,			required	)
+		__array(char,			ret, 32		)
 	),
 
 	TP_fast_assign(
 		strscpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
 		__entry->caller_ip	= caller_ip;
 		__entry->required	= required;
+		strscpy(__entry->ret, bch2_err_str(ret), sizeof(__entry->ret));
 	),
 
-	TP_printk("%s %pS required %zu",
+	TP_printk("%s %pS required %zu ret %s",
 		  __entry->trans_fn,
 		  (void *) __entry->caller_ip,
-		  __entry->required)
+		  __entry->required,
+		  __entry->ret)
 );
 
 DEFINE_EVENT(btree_node, btree_node_compact,
@@ -542,14 +546,11 @@ TRACE_EVENT(bucket_alloc_fail,
 		 u64 avail,
 		 u64 copygc_wait_amount,
 		 s64 copygc_waiting_for,
-		 u64 seen,
-		 u64 open,
-		 u64 need_journal_commit,
-		 u64 nouse,
+		 struct bucket_alloc_state *s,
 		 bool nonblocking,
 		 const char *err),
 	TP_ARGS(ca, alloc_reserve, free, avail, copygc_wait_amount, copygc_waiting_for,
-		seen, open, need_journal_commit, nouse, nonblocking, err),
+		s, nonblocking, err),
 
 	TP_STRUCT__entry(
 		__field(dev_t,			dev			)
@@ -573,10 +574,10 @@ TRACE_EVENT(bucket_alloc_fail,
 		__entry->avail		= avail;
 		__entry->copygc_wait_amount	= copygc_wait_amount;
 		__entry->copygc_waiting_for	= copygc_waiting_for;
-		__entry->seen		= seen;
-		__entry->open		= open;
-		__entry->need_journal_commit = need_journal_commit;
-		__entry->nouse		= nouse;
+		__entry->seen		= s->buckets_seen;
+		__entry->open		= s->skipped_open;
+		__entry->need_journal_commit = s->skipped_need_journal_commit;
+		__entry->nouse		= s->skipped_nouse;
 		__entry->nonblocking	= nonblocking;
 		strscpy(__entry->err, err, sizeof(__entry->err));
 	),