Update bcachefs sources to 4a32728376a8 bcachefs: bcachefs_metadata_v…

…ersion_inode_depth

Signed-off-by: Kent Overstreet <[email protected]>

.bcachefs_revision

@@ -1 +1 @@
-bc01863fb6eff06f7b028e4c5cd8850d21d7f10d
+4a32728376a81dd9e75851a49159ff33602840f4

bch_bindgen/src/bkey.rs

@@ -50,6 +50,7 @@ pub enum BkeyValC<'a> {
     logged_op_truncate(&'a c::bch_logged_op_truncate),
     logged_op_finsert(&'a c::bch_logged_op_finsert),
     accounting(&'a c::bch_accounting),
+    inode_alloc_cursor(&'a c::bch_inode_alloc_cursor),
 }
 
 impl<'a, 'b> BkeySC<'a> {
@@ -106,6 +107,7 @@ impl<'a, 'b> BkeySC<'a> {
                 KEY_TYPE_logged_op_truncate => logged_op_truncate(transmute(self.v)),
                 KEY_TYPE_logged_op_finsert => logged_op_finsert(transmute(self.v)),
                 KEY_TYPE_accounting => accounting(transmute(self.v)),
+                KEY_TYPE_inode_alloc_cursor => inode_alloc_cursor(transmute(self.v)),
                 KEY_TYPE_MAX => unreachable!(),
             }
         }

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)

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) {}