summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2016-07-12 20:35:18 -0800
committerKent Overstreet <kent.overstreet@gmail.com>2016-10-07 12:36:39 -0800
commitc100788f14431ea7c0babeac95d37bf22c4191eb (patch)
tree1b0438da9aa2be7d2f000933cbad681ccfe13525
parente84aa6578fb3c8e14102948eae9a727566727dfc (diff)
bcachefs: fix an error path in the dio write code
-rw-r--r--drivers/md/bcache/fs-io.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/md/bcache/fs-io.c b/drivers/md/bcache/fs-io.c
index 0f0a9e04c959..60bc059de187 100644
--- a/drivers/md/bcache/fs-io.c
+++ b/drivers/md/bcache/fs-io.c
@@ -1298,6 +1298,12 @@ static void bch_do_direct_IO_write(struct dio_write *dio)
ret = bio_get_user_pages(bio, &dio->iter, 0);
if (ret < 0) {
+ /*
+ * these didn't get initialized, but bch_dio_write_done() will
+ * look at them:
+ */
+ dio->iop.op.error = 0;
+ dio->iop.op.written = 0;
dio->error = ret;
return;
}