Update bcachefs sources to 4a32728376a8 bcachefs: bcachefs_metadata_version_inode_depth

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

2 files changed, 13 insertions, 23 deletions

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 24df2cc5..4a6d015f 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -103,6 +103,8 @@ static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
 	((size) != 0 && (n) > SIZE_MAX / (size)				\
 	 ? NULL : kmalloc((n) * (size), flags))
 
+#define kvcalloc(n, size, flags)	kvmalloc_array(n, size, flags|__GFP_ZERO)
+
 #define kvmalloc_array_noprof(...)	kvmalloc_array(__VA_ARGS__)
 
 #define kcalloc(n, size, flags)		kmalloc_array(n, size, flags|__GFP_ZERO)
diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index b93cb8e3..7aa2b964 100644
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -7,6 +7,11 @@
 
 typedef void (*rcu_callback_t)(struct rcu_head *head);
 
+static inline struct urcu_gp_poll_state get_state_synchronize_rcu()
+{
+	return start_poll_synchronize_rcu();
+}
+
 struct srcu_struct {
 };
 
@@ -17,36 +22,19 @@ static inline int srcu_read_lock(struct srcu_struct *ssp)
 	return 0;
 }
 
-static inline bool poll_state_synchronize_srcu(struct srcu_struct *ssp, unsigned long cookie)
-{
-	return true;
-}
-
-static inline unsigned long start_poll_synchronize_srcu(struct srcu_struct *ssp)
-{
-	return 0;
-}
-
-static inline unsigned long get_state_synchronize_srcu(struct srcu_struct *ssp)
-{
-	return 0;
-}
-
-#undef poll_state_synchronize_rcu
-static inline bool poll_state_synchronize_rcu(unsigned long cookie)
+static inline bool poll_state_synchronize_srcu(struct srcu_struct *ssp, struct urcu_gp_poll_state cookie)
 {
-	return false;
+	return poll_state_synchronize_rcu(cookie);
 }
 
-#undef start_poll_synchronize_rcu
-static inline unsigned long start_poll_synchronize_rcu()
+static inline struct urcu_gp_poll_state start_poll_synchronize_srcu(struct srcu_struct *ssp)
 {
-	return 0;
+	return start_poll_synchronize_rcu();
 }
 
-static inline unsigned long get_state_synchronize_rcu()
+static inline struct urcu_gp_poll_state get_state_synchronize_srcu(struct srcu_struct *ssp)
 {
-	return 0;
+	return get_state_synchronize_rcu();
 }
 
 static inline void synchronize_srcu_expedited(struct srcu_struct *ssp) {}