bcache: Avoid comma separated statements

Use semicolons and braces.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
index 67a2c47f4201ae03fd9d41febeb507ea623a351d..94d38e8a59b323aa576cc1b0f6ed6ef95ebef49d 100644 (file)
--- a/drivers/md/bcache/bset.c
+++ b/drivers/md/bcache/bset.c
@@ -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;

diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c
index eef15f8022baa99038533683f08db3851a82b62e..cc89f3156d1aadb0953f249d82bb2a4cde976230 100644 (file)
--- a/drivers/md/bcache/sysfs.c
+++ b/drivers/md/bcache/sysfs.c
@@ -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];