Commit 6751c1e3 authored by Joe Perches's avatar Joe Perches Committed by Jens Axboe
Browse files

bcache: Avoid comma separated statements 



Use semicolons and braces.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarColy Li <colyli@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent afe78ab4

drivers/md/bcache/bset.c

+8 −4
Original line number Diff line number Diff line
@@ -712,8 +712,10 @@ void bch_bset_build_written_tree(struct btree_keys *b) 
	for (j = inorder_next(0, t->size);

	     j;

	     j = inorder_next(j, t->size)) {

		while (bkey_to_cacheline(t, k) < cacheline)

			prev = k, k = bkey_next(k);

		while (bkey_to_cacheline(t, k) < cacheline) {

			prev = k;

			k = bkey_next(k);

		}



		t->prev[j] = bkey_u64s(prev);

		t->tree[j].m = bkey_to_cacheline_offset(t, cacheline++, k);
@@ -901,8 +903,10 @@ unsigned int bch_btree_insert_key(struct btree_keys *b, struct bkey *k, 
	status = BTREE_INSERT_STATUS_INSERT;



	while (m != bset_bkey_last(i) &&

	       bkey_cmp(k, b->ops->is_extents ? &START_KEY(m) : m) > 0)

		prev = m, m = bkey_next(m);

	       bkey_cmp(k, b->ops->is_extents ? &START_KEY(m) : m) > 0) {

		prev = m;

		m = bkey_next(m);

	}



	/* prev is in the tree, if we merge we're done */

	status = BTREE_INSERT_STATUS_BACK_MERGE;

drivers/md/bcache/sysfs.c

+4 −2
Original line number Diff line number Diff line
@@ -1094,8 +1094,10 @@ SHOW(__bch_cache) 
			--n;



		while (cached < p + n &&

		       *cached == BTREE_PRIO)

			cached++, n--;

		       *cached == BTREE_PRIO) {

			cached++;

			n--;

		}



		for (i = 0; i < n; i++)

			sum += INITIAL_PRIO - cached[i];