Commit a42d3c64 authored by Coly Li's avatar Coly Li Committed by Jens Axboe

bcache: disassemble the big if() checks in bch_cache_set_alloc()

In bch_cache_set_alloc() there is a big if() checks combined by 11 items
together. When this big if() statement fails, it is difficult to tell
exactly which item fails indeed.

This patch disassembles this big if() checks into 11 single if() checks,
which makes code debug more easier.
Signed-off-by: default avatarColy Li <colyli@suse.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c557a5f7
...@@ -1873,21 +1873,43 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb) ...@@ -1873,21 +1873,43 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb)
iter_size = (sb->bucket_size / sb->block_size + 1) * iter_size = (sb->bucket_size / sb->block_size + 1) *
sizeof(struct btree_iter_set); sizeof(struct btree_iter_set);
if (!(c->devices = kcalloc(c->nr_uuids, sizeof(void *), GFP_KERNEL)) || c->devices = kcalloc(c->nr_uuids, sizeof(void *), GFP_KERNEL);
mempool_init_slab_pool(&c->search, 32, bch_search_cache) || if (!c->devices)
mempool_init_kmalloc_pool(&c->bio_meta, 2, goto err;
sizeof(struct bbio) + sizeof(struct bio_vec) *
bucket_pages(c)) || if (mempool_init_slab_pool(&c->search, 32, bch_search_cache))
mempool_init_kmalloc_pool(&c->fill_iter, 1, iter_size) || goto err;
bioset_init(&c->bio_split, 4, offsetof(struct bbio, bio),
BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER) || if (mempool_init_kmalloc_pool(&c->bio_meta, 2,
!(c->uuids = alloc_bucket_pages(GFP_KERNEL, c)) || sizeof(struct bbio) +
!(c->moving_gc_wq = alloc_workqueue("bcache_gc", sizeof(struct bio_vec) * bucket_pages(c)))
WQ_MEM_RECLAIM, 0)) || goto err;
bch_journal_alloc(c) ||
bch_btree_cache_alloc(c) || if (mempool_init_kmalloc_pool(&c->fill_iter, 1, iter_size))
bch_open_buckets_alloc(c) || goto err;
bch_bset_sort_state_init(&c->sort, ilog2(c->btree_pages)))
if (bioset_init(&c->bio_split, 4, offsetof(struct bbio, bio),
BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER))
goto err;
c->uuids = alloc_bucket_pages(GFP_KERNEL, c);
if (!c->uuids)
goto err;
c->moving_gc_wq = alloc_workqueue("bcache_gc", WQ_MEM_RECLAIM, 0);
if (!c->moving_gc_wq)
goto err;
if (bch_journal_alloc(c))
goto err;
if (bch_btree_cache_alloc(c))
goto err;
if (bch_open_buckets_alloc(c))
goto err;
if (bch_bset_sort_state_init(&c->sort, ilog2(c->btree_pages)))
goto err; goto err;
c->congested_read_threshold_us = 2000; c->congested_read_threshold_us = 2000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment