Merge tag 'block-6.7-2023-12-01' of git://git.kernel.dk/linux

[thirdparty/linux.git] / drivers / md / bcache / btree.c

diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 26159679121824345f842e6c297b2a36b4db437b..196cdacce38f253ffee057da72221b017b94565b 100644 (file)
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -293,16 +293,16 @@ static void btree_complete_write(struct btree *b, struct btree_write *w)
        w->journal      = NULL;
 }
 
-static void btree_node_write_unlock(struct closure *cl)
+static CLOSURE_CALLBACK(btree_node_write_unlock)
 {
-       struct btree *b = container_of(cl, struct btree, io);
+       closure_type(b, struct btree, io);
 
        up(&b->io_mutex);
 }
 
-static void __btree_node_write_done(struct closure *cl)
+static CLOSURE_CALLBACK(__btree_node_write_done)
 {
-       struct btree *b = container_of(cl, struct btree, io);
+       closure_type(b, struct btree, io);
        struct btree_write *w = btree_prev_write(b);
 
        bch_bbio_free(b->bio, b->c);
@@ -315,12 +315,12 @@ static void __btree_node_write_done(struct closure *cl)
        closure_return_with_destructor(cl, btree_node_write_unlock);
 }
 
-static void btree_node_write_done(struct closure *cl)
+static CLOSURE_CALLBACK(btree_node_write_done)
 {
-       struct btree *b = container_of(cl, struct btree, io);
+       closure_type(b, struct btree, io);
 
        bio_free_pages(b->bio);
-       __btree_node_write_done(cl);
+       __btree_node_write_done(&cl->work);
 }
 
 static void btree_node_write_endio(struct bio *bio)