From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Mon, 11 Nov 2019 18:42:10 +0000 (-0500)
Subject: bcachefs: Fix erorr path in bch2_write()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c32bd3ad1fe595bb96c3c781f29c7002f73450a2;p=linux.git

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 <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c
index 272477fb558f7..f53eee7accc89 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 */