From b0cbf659a5349ec73c5745bdf1975d5915f89071 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Fri, 18 Jan 2019 18:58:51 -0500 Subject: [PATCH] bcachefs: Fix an allocator error path Signed-off-by: Kent Overstreet --- fs/bcachefs/alloc_foreground.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c index 9eae8c29e3c4e..f37110497b51e 100644 --- a/fs/bcachefs/alloc_foreground.c +++ b/fs/bcachefs/alloc_foreground.c @@ -838,15 +838,17 @@ struct write_point *bch2_alloc_sectors_start(struct bch_fs *c, { struct write_point *wp; struct open_bucket *ob; - unsigned nr_effective = 0; - struct open_buckets ptrs = { .nr = 0 }; - bool have_cache = false; - unsigned write_points_nr; - int ret = 0, i; + struct open_buckets ptrs; + unsigned nr_effective, write_points_nr; + bool have_cache; + int ret, i; BUG_ON(!nr_replicas || !nr_replicas_required); retry: + ptrs.nr = 0; + nr_effective = 0; write_points_nr = c->write_points_nr; + have_cache = false; wp = writepoint_find(c, write_point.v); -- 2.30.2