bcachefs: Fix locking in __bch2_trans_mark_dev_sb()

We run this in full RW mode now, so we have to guard against the
superblock buffer being reallocated.

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

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index 6cbf2aa6a9479b346f2f64bd650b41f6111fec08..eb3002c4eae7b1615c8a16b17b60e119fca7a8c1 100644 (file)
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -741,12 +741,9 @@ fsck_err:
 
 static int bch2_mark_superblocks(struct bch_fs *c)
 {
-       mutex_lock(&c->sb_lock);
        gc_pos_set(c, gc_phase(GC_PHASE_sb));
 
-       int ret = bch2_trans_mark_dev_sbs_flags(c, BTREE_TRIGGER_gc);
-       mutex_unlock(&c->sb_lock);
-       return ret;
+       return bch2_trans_mark_dev_sbs_flags(c, BTREE_TRIGGER_gc);
 }
 
 static void bch2_gc_free(struct bch_fs *c)

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index ad517ef744e57765941c15465182cc2bc0431bae..be2bbd2486314f12c1348892358495d5e5b82f6d 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -915,7 +915,6 @@ static int __bch2_trans_mark_metadata_bucket(struct btree_trans *trans,
                                    enum bch_data_type type,
                                    unsigned sectors)
 {
-       struct bch_fs *c = trans->c;
        struct btree_iter iter;
        int ret = 0;
 
@@ -1046,13 +1045,18 @@ static int bch2_trans_mark_metadata_sectors(struct btree_trans *trans,
 static int __bch2_trans_mark_dev_sb(struct btree_trans *trans, struct bch_dev *ca,
                        enum btree_iter_update_trigger_flags flags)
 {
-       struct bch_sb_layout *layout = &ca->disk_sb.sb->layout;
+       struct bch_fs *c = trans->c;
+
+       mutex_lock(&c->sb_lock);
+       struct bch_sb_layout layout = ca->disk_sb.sb->layout;
+       mutex_unlock(&c->sb_lock);
+
        u64 bucket = 0;
        unsigned i, bucket_sectors = 0;
        int ret;
 
-       for (i = 0; i < layout->nr_superblocks; i++) {
-               u64 offset = le64_to_cpu(layout->sb_offset[i]);
+       for (i = 0; i < layout.nr_superblocks; i++) {
+               u64 offset = le64_to_cpu(layout.sb_offset[i]);
 
                if (offset == BCH_SB_SECTOR) {
                        ret = bch2_trans_mark_metadata_sectors(trans, ca,
@@ -1063,7 +1067,7 @@ static int __bch2_trans_mark_dev_sb(struct btree_trans *trans, struct bch_dev *c
                }
 
                ret = bch2_trans_mark_metadata_sectors(trans, ca, offset,
-                                     offset + (1 << layout->sb_max_size_bits),
+                                     offset + (1 << layout.sb_max_size_bits),
                                      BCH_DATA_sb, &bucket, &bucket_sectors, flags);
                if (ret)
                        return ret;