From: Kent Overstreet Date: Mon, 23 Jul 2018 09:28:40 +0000 (-0400) Subject: bcachefs: fix nbuckets usage on device resize X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3142e7ef4b39f03c1e1aac90c2ac8f07f55ffa64;p=linux.git bcachefs: fix nbuckets usage on device resize Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index 6a7e8b7b6a79a..65232f5e61bcc 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -818,9 +818,9 @@ int bch2_dev_buckets_resize(struct bch_fs *c, struct bch_dev *ca, u64 nbuckets) size_t btree_reserve = DIV_ROUND_UP(BTREE_NODE_RESERVE, ca->mi.bucket_size / c->opts.btree_node_size); /* XXX: these should be tunable */ - size_t reserve_none = max_t(size_t, 4, ca->mi.nbuckets >> 9); - size_t copygc_reserve = max_t(size_t, 16, ca->mi.nbuckets >> 7); - size_t free_inc_nr = max(max_t(size_t, 16, ca->mi.nbuckets >> 12), + size_t reserve_none = max_t(size_t, 4, nbuckets >> 9); + size_t copygc_reserve = max_t(size_t, 16, nbuckets >> 7); + size_t free_inc_nr = max(max_t(size_t, 16, nbuckets >> 12), btree_reserve); bool resize = ca->buckets != NULL, start_copygc = ca->copygc_thread != NULL;