[PATCH 1/3] bcachefs: bch2_copygc_wakeup()

[Kent Overstreet]

Signed-off-by: Kent Overstreet <kent.overstr...@linux.dev>
---
 fs/bcachefs/movinggc.h  | 9 +++++++++
 fs/bcachefs/rebalance.c | 4 ++--
 fs/bcachefs/rebalance.h | 2 +-
 fs/bcachefs/super.c     | 4 ++--
 fs/bcachefs/sysfs.c     | 7 +++----
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/fs/bcachefs/movinggc.h b/fs/bcachefs/movinggc.h
index ea181fef5bc9..d1885cf67a45 100644
--- a/fs/bcachefs/movinggc.h
+++ b/fs/bcachefs/movinggc.h
@@ -5,6 +5,15 @@
 unsigned long bch2_copygc_wait_amount(struct bch_fs *);
 void bch2_copygc_wait_to_text(struct printbuf *, struct bch_fs *);
 
+static inline void bch2_copygc_wakeup(struct bch_fs *c)
+{
+       rcu_read_lock();
+       struct task_struct *p = rcu_dereference(c->copygc_thread);
+       if (p)
+               wake_up_process(p);
+       rcu_read_unlock();
+}
+
 void bch2_copygc_stop(struct bch_fs *);
 int bch2_copygc_start(struct bch_fs *);
 void bch2_fs_copygc_init(struct bch_fs *);
diff --git a/fs/bcachefs/rebalance.c b/fs/bcachefs/rebalance.c
index 63f013496687..d63de50f6323 100644
--- a/fs/bcachefs/rebalance.c
+++ b/fs/bcachefs/rebalance.c
@@ -268,7 +268,7 @@ int bch2_set_rebalance_needs_scan(struct bch_fs *c, u64 
inum)
        int ret = bch2_trans_commit_do(c, NULL, NULL,
                                       BCH_TRANS_COMMIT_no_enospc,
                            bch2_set_rebalance_needs_scan_trans(trans, inum));
-       rebalance_wakeup(c);
+       bch2_rebalance_wakeup(c);
        return ret;
 }
 
@@ -670,7 +670,7 @@ void bch2_rebalance_stop(struct bch_fs *c)
        c->rebalance.thread = NULL;
 
        if (p) {
-               /* for sychronizing with rebalance_wakeup() */
+               /* for sychronizing with bch2_rebalance_wakeup() */
                synchronize_rcu();
 
                kthread_stop(p);
diff --git a/fs/bcachefs/rebalance.h b/fs/bcachefs/rebalance.h
index 62a3859d3823..e5e8eb4a2dd1 100644
--- a/fs/bcachefs/rebalance.h
+++ b/fs/bcachefs/rebalance.h
@@ -37,7 +37,7 @@ int bch2_set_rebalance_needs_scan_trans(struct btree_trans *, 
u64);
 int bch2_set_rebalance_needs_scan(struct bch_fs *, u64 inum);
 int bch2_set_fs_needs_rebalance(struct bch_fs *);
 
-static inline void rebalance_wakeup(struct bch_fs *c)
+static inline void bch2_rebalance_wakeup(struct bch_fs *c)
 {
        struct task_struct *p;
 
diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index 222b31f23799..72e001e4c151 100644
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -1526,7 +1526,7 @@ static int bch2_dev_attach_bdev(struct bch_fs *c, struct 
bch_sb_handle *sb)
        strscpy(ca->name, name.buf, sizeof(ca->name));
        printbuf_exit(&name);
 
-       rebalance_wakeup(c);
+       bch2_rebalance_wakeup(c);
        return 0;
 }
 
@@ -1672,7 +1672,7 @@ int __bch2_dev_set_state(struct bch_fs *c, struct bch_dev 
*ca,
        if (new_state == BCH_MEMBER_STATE_rw)
                __bch2_dev_read_write(c, ca);
 
-       rebalance_wakeup(c);
+       bch2_rebalance_wakeup(c);
 
        return ret;
 }
diff --git a/fs/bcachefs/sysfs.c b/fs/bcachefs/sysfs.c
index fff675edef4e..00405372af5e 100644
--- a/fs/bcachefs/sysfs.c
+++ b/fs/bcachefs/sysfs.c
@@ -766,11 +766,10 @@ static ssize_t sysfs_opt_store(struct bch_fs *c,
                bch2_set_rebalance_needs_scan(c, 0);
 
        if (v && id == Opt_rebalance_enabled)
-               rebalance_wakeup(c);
+               bch2_rebalance_wakeup(c);
 
-       if (v && id == Opt_copygc_enabled &&
-           c->copygc_thread)
-               wake_up_process(c->copygc_thread);
+       if (v && id == Opt_copygc_enabled)
+               bch2_copygc_wakeup(c);
 
        if (id == Opt_discard && !ca) {
                mutex_lock(&c->sb_lock);
-- 
2.49.0