bcachefs: Reduce stack frame size of bch2_check_alloc_info()

Excessive inlining may (on some versions of gcc?) cause excessive stack
usage; this turns off some inlining in bch2_check_alloc_info.

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

diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c
index f68330b488474163cbcd3140a207280606bc7996..4486ce0b79204bcf555d49abe28af221673f9eca 100644 (file)
--- a/fs/bcachefs/alloc_background.c
+++ b/fs/bcachefs/alloc_background.c
@@ -1030,12 +1030,13 @@ again:
        return k;
 }
 
-static int bch2_check_alloc_key(struct btree_trans *trans,
-                               struct bkey_s_c alloc_k,
-                               struct btree_iter *alloc_iter,
-                               struct btree_iter *discard_iter,
-                               struct btree_iter *freespace_iter,
-                               struct btree_iter *bucket_gens_iter)
+static noinline_for_stack
+int bch2_check_alloc_key(struct btree_trans *trans,
+                        struct bkey_s_c alloc_k,
+                        struct btree_iter *alloc_iter,
+                        struct btree_iter *discard_iter,
+                        struct btree_iter *freespace_iter,
+                        struct btree_iter *bucket_gens_iter)
 {
        struct bch_fs *c = trans->c;
        struct bch_dev *ca;
@@ -1159,10 +1160,11 @@ fsck_err:
        return ret;
 }
 
-static int bch2_check_alloc_hole_freespace(struct btree_trans *trans,
-                                struct bpos start,
-                                struct bpos *end,
-                                struct btree_iter *freespace_iter)
+static noinline_for_stack
+int bch2_check_alloc_hole_freespace(struct btree_trans *trans,
+                                   struct bpos start,
+                                   struct bpos *end,
+                                   struct btree_iter *freespace_iter)
 {
        struct bch_fs *c = trans->c;
        struct bch_dev *ca;
@@ -1214,10 +1216,11 @@ fsck_err:
        return ret;
 }
 
-static int bch2_check_alloc_hole_bucket_gens(struct btree_trans *trans,
-                                struct bpos start,
-                                struct bpos *end,
-                                struct btree_iter *bucket_gens_iter)
+static noinline_for_stack
+int bch2_check_alloc_hole_bucket_gens(struct btree_trans *trans,
+                                     struct bpos start,
+                                     struct bpos *end,
+                                     struct btree_iter *bucket_gens_iter)
 {
        struct bch_fs *c = trans->c;
        struct bkey_s_c k;
@@ -1279,7 +1282,7 @@ fsck_err:
        return ret;
 }
 
-static int __bch2_check_discard_freespace_key(struct btree_trans *trans,
+static noinline_for_stack int __bch2_check_discard_freespace_key(struct btree_trans *trans,
                                              struct btree_iter *iter)
 {
        struct bch_fs *c = trans->c;
@@ -1359,9 +1362,10 @@ static int bch2_check_discard_freespace_key(struct btree_trans *trans,
  * valid for buckets that exist; this just checks for keys for nonexistent
  * buckets.
  */
-static int bch2_check_bucket_gens_key(struct btree_trans *trans,
-                                     struct btree_iter *iter,
-                                     struct bkey_s_c k)
+static noinline_for_stack
+int bch2_check_bucket_gens_key(struct btree_trans *trans,
+                              struct btree_iter *iter,
+                              struct bkey_s_c k)
 {
        struct bch_fs *c = trans->c;
        struct bkey_i_bucket_gens g;