summaryrefslogtreecommitdiff
path: root/drivers/md/bcache/super.c
diff options
context:
space:
mode:
authorKent Overstreet <koverstreet@google.com>2013-03-25 22:46:44 +0400
committerJens Axboe <axboe@kernel.dk>2013-03-25 23:06:13 +0400
commitb1a67b0f4c747ca10c96ebb24f04e2a74b3c298d (patch)
tree32ff70d72673de4e99ae3b8c517540ccbe6a547f /drivers/md/bcache/super.c
parent07e86ccb543bb1e748f32d6f0f18913d3f58d988 (diff)
downloadlinux-b1a67b0f4c747ca10c96ebb24f04e2a74b3c298d.tar.xz
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>
Diffstat (limited to 'drivers/md/bcache/super.c')
-rw-r--r--drivers/md/bcache/super.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 7b8efc770871..484ae6c8f43a 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -526,7 +526,8 @@ void bch_prio_write(struct cache *ca)
for (i = prio_buckets(ca) - 1; i >= 0; --i) {
long bucket;
struct prio_set *p = ca->disk_buckets;
- struct bucket_disk *d = p->data, *end = d + prios_per_bucket(ca);
+ struct bucket_disk *d = p->data;
+ struct bucket_disk *end = d + prios_per_bucket(ca);
for (b = ca->buckets + i * prios_per_bucket(ca);
b < ca->buckets + ca->sb.nbuckets && d < end;
@@ -865,8 +866,8 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c)
if (dc->sb.block_size < c->sb.block_size) {
/* Will die */
- pr_err("Couldn't attach %s: block size "
- "less than set's block size", buf);
+ pr_err("Couldn't attach %s: block size less than set's block size",
+ buf);
return -EINVAL;
}