bcachefs: kill ca->freelist_lock

All uses were supposed to be switched over to c->freelist_lock

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

diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
index 344cf982124fabc9cb4610bb4ff855a296d5be55..3fa053531344e6ad9ec57d3a82a361a59e40bd61 100644 (file)
--- a/fs/bcachefs/bcachefs.h
+++ b/fs/bcachefs/bcachefs.h
@@ -427,7 +427,6 @@ struct bch_dev {
         */
        alloc_fifo              free[RESERVE_NR];
        alloc_fifo              free_inc;
-       spinlock_t              freelist_lock;
 
        u8                      open_buckets_partial[OPEN_BUCKETS_COUNT];
        unsigned                open_buckets_partial_nr;

diff --git a/fs/bcachefs/movinggc.c b/fs/bcachefs/movinggc.c
index 84971fbfc722153c8ff3151094e642b797a54b26..c6159a34e5096669a343acd50387c19a85f0efd1 100644 (file)
--- a/fs/bcachefs/movinggc.c
+++ b/fs/bcachefs/movinggc.c
@@ -107,10 +107,10 @@ static bool have_copygc_reserve(struct bch_dev *ca)
 {
        bool ret;
 
-       spin_lock(&ca->freelist_lock);
+       spin_lock(&ca->fs->freelist_lock);
        ret = fifo_full(&ca->free[RESERVE_MOVINGGC]) ||
                ca->allocator_state != ALLOCATOR_RUNNING;
-       spin_unlock(&ca->freelist_lock);
+       spin_unlock(&ca->fs->freelist_lock);
 
        return ret;
 }

diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index 8c7b56a95f4b4a041d15aad567ff87d3c9588c7a..3ad4c0ecbe128be14c6c580ca1833669fff09769 100644 (file)
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -1059,7 +1059,6 @@ static struct bch_dev *__bch2_dev_alloc(struct bch_fs *c,
 
        writepoint_init(&ca->copygc_write_point, BCH_DATA_USER);
 
-       spin_lock_init(&ca->freelist_lock);
        bch2_dev_copygc_init(ca);
 
        INIT_WORK(&ca->io_error_work, bch2_io_error_work);

diff --git a/fs/bcachefs/sysfs.c b/fs/bcachefs/sysfs.c
index b0f09a31c41ec1af505f1997e3a1c59c013aeda7..8d68331f8b6329c20bec64130e073cfd864c0d12 100644 (file)
--- a/fs/bcachefs/sysfs.c
+++ b/fs/bcachefs/sysfs.c
@@ -775,7 +775,7 @@ static ssize_t show_reserve_stats(struct bch_dev *ca, char *buf)
        struct printbuf out = _PBUF(buf, PAGE_SIZE);
        enum alloc_reserve i;
 
-       spin_lock(&ca->freelist_lock);
+       spin_lock(&ca->fs->freelist_lock);
 
        pr_buf(&out, "free_inc:\t%zu\t%zu\n",
               fifo_used(&ca->free_inc),
@@ -786,7 +786,7 @@ static ssize_t show_reserve_stats(struct bch_dev *ca, char *buf)
                       fifo_used(&ca->free[i]),
                       ca->free[i].size);
 
-       spin_unlock(&ca->freelist_lock);
+       spin_unlock(&ca->fs->freelist_lock);
 
        return out.pos - buf;
 }