bcache: Style/checkpatch fixes
Took out some nested functions, and fixed some more checkpatch
complaints.
Signed-off-by: Kent Overstreet <koverstreet@google.com>
Cc: linux-bcache@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
index 79fe1f0..4dc9cb4 100644
--- a/drivers/md/bcache/bset.c
+++ b/drivers/md/bcache/bset.c
@@ -161,9 +161,9 @@
#ifdef CONFIG_BCACHE_EDEBUG
bug:
mutex_unlock(&b->c->bucket_lock);
- btree_bug(b, "inconsistent pointer %s: bucket %zu pin %i "
- "prio %i gen %i last_gc %i mark %llu gc_gen %i", pkey(k),
- PTR_BUCKET_NR(b->c, k, i), atomic_read(&g->pin),
+ btree_bug(b,
+"inconsistent pointer %s: bucket %zu pin %i prio %i gen %i last_gc %i mark %llu gc_gen %i",
+ pkey(k), PTR_BUCKET_NR(b->c, k, i), atomic_read(&g->pin),
g->prio, g->gen, g->last_gc, GC_MARK(g), g->gc_gen);
return true;
#endif
@@ -1049,7 +1049,8 @@
for (i = start; i <= b->nsets; i++)
keys += b->sets[i].data->keys;
- order = roundup_pow_of_two(__set_bytes(b->sets->data, keys)) / PAGE_SIZE;
+ order = roundup_pow_of_two(__set_bytes(b->sets->data,
+ keys)) / PAGE_SIZE;
if (order)
order = ilog2(order);
}