bcachefs: btree_io_complete_wq -> btree_write_complete_wq

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

diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
index 24eed2b3be4d55bd8d582634d2f34aed6ff7002e..09df91f10c203c6ab978ba99c46a9ab0d3f31fdb 100644 (file)
--- a/fs/bcachefs/bcachefs.h
+++ b/fs/bcachefs/bcachefs.h
@@ -877,7 +877,7 @@ struct bch_fs {
        struct btree_write_buffer btree_write_buffer;
 
        struct workqueue_struct *btree_update_wq;
-       struct workqueue_struct *btree_io_complete_wq;
+       struct workqueue_struct *btree_write_complete_wq;
        /* copygc needs its own workqueue for index updates.. */
        struct workqueue_struct *copygc_wq;
        /*

diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c
index 60782f3e5aec84e46b2c6f4dd006c1f8532106ca..69b2075023818902ac471b3d1e89e6d8461c0816 100644 (file)
--- a/fs/bcachefs/btree_io.c
+++ b/fs/bcachefs/btree_io.c
@@ -2184,7 +2184,7 @@ static void btree_node_write_endio(struct bio *bio)
        smp_mb__after_atomic();
        wake_up_bit(&b->flags, BTREE_NODE_write_in_flight_inner);
        INIT_WORK(&wb->work, btree_node_write_work);
-       queue_work(c->btree_io_complete_wq, &wb->work);
+       queue_work(c->btree_write_complete_wq, &wb->work);
 }
 
 static int validate_bset_for_write(struct bch_fs *c, struct btree *b,

diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index 84a37d971ffdae113ad2e2c2279a1a7a740ecf57..cb3195a4fdb02b6016b4f5577380e7427dd59b02 100644 (file)
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -601,8 +601,8 @@ static void __bch2_fs_free(struct bch_fs *c)
                destroy_workqueue(c->btree_read_complete_wq);
        if (c->copygc_wq)
                destroy_workqueue(c->copygc_wq);
-       if (c->btree_io_complete_wq)
-               destroy_workqueue(c->btree_io_complete_wq);
+       if (c->btree_write_complete_wq)
+               destroy_workqueue(c->btree_write_complete_wq);
        if (c->btree_update_wq)
                destroy_workqueue(c->btree_update_wq);
 
@@ -876,7 +876,7 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts)
 
        if (!(c->btree_update_wq = alloc_workqueue("bcachefs",
                                WQ_HIGHPRI|WQ_FREEZABLE|WQ_MEM_RECLAIM|WQ_UNBOUND, 512)) ||
-           !(c->btree_io_complete_wq = alloc_workqueue("bcachefs_btree_io",
+           !(c->btree_write_complete_wq = alloc_workqueue("bcachefs_btree_write",
                                WQ_HIGHPRI|WQ_FREEZABLE|WQ_MEM_RECLAIM, 1)) ||
            !(c->copygc_wq = alloc_workqueue("bcachefs_copygc",
                                WQ_HIGHPRI|WQ_FREEZABLE|WQ_MEM_RECLAIM|WQ_CPU_INTENSIVE, 1)) ||