Update bcachefs sources to ffad51ba45 bcachefs: Fix a use after free

diff --git a/.bcachefs_revision b/.bcachefs_revision
index 6f4750b7de12f086c79956fe4facaf4885b1022c..b1e0bf830bdbada26f1cc6ef896158dab7869bc4 100644 (file)
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-04036b491089aeb4bac5d796ae1716d019564f7a
+ffad51ba45f8c0785bbb2e2903715d825a8eea9a

diff --git a/libbcachefs/btree_update_leaf.c b/libbcachefs/btree_update_leaf.c
index 19cb6e1e9722a3ab2679cb0a02126cbce800dbaf..ee978f33390e5ae28ec5ad0035b6a6ab2eca89e0 100644 (file)
--- a/libbcachefs/btree_update_leaf.c
+++ b/libbcachefs/btree_update_leaf.c
@@ -387,7 +387,12 @@ btree_key_can_insert_cached(struct btree_trans *trans,
         */
        trace_trans_restart_key_cache_key_realloced(trans->fn, _RET_IP_,
                                             path->btree_id, &path->pos);
-       return btree_trans_restart(trans);
+       /*
+        * Not using btree_trans_restart() because we can't unlock here, we have
+        * write locks held:
+        */
+       trans->restarted = true;
+       return -EINTR;
 }
 
 static inline void do_btree_insert_one(struct btree_trans *trans,