From c32bd3ad1fe595bb96c3c781f29c7002f73450a2 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 11 Nov 2019 13:42:10 -0500 Subject: bcachefs: Fix erorr path in bch2_write() The error path in bch2_write wasn't updated when the end_io callback was added to bch_write_op. Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- fs/bcachefs/io.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'fs/bcachefs') diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c index 272477fb558f..f53eee7accc8 100644 --- a/fs/bcachefs/io.c +++ b/fs/bcachefs/io.c @@ -1176,7 +1176,12 @@ void bch2_write(struct closure *cl) err: if (!(op->flags & BCH_WRITE_NOPUT_RESERVATION)) bch2_disk_reservation_put(c, &op->res); - closure_return(cl); + if (op->end_io) + op->end_io(op); + if (cl->parent) + closure_return(cl); + else + closure_debug_destroy(cl); } /* Cache promotion on read */ -- cgit