summaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/journal.c
diff options
context:
space:
mode:
authorKent Overstreet <koverstreet@google.com>2013-03-25 11:46:44 -0700
committerJens Axboe <axboe@kernel.dk>2013-03-25 13:06:13 -0600
commitb1a67b0f4c747ca10c96ebb24f04e2a74b3c298d (patch)
tree32ff70d72673de4e99ae3b8c517540ccbe6a547f /drivers/md/bcache/journal.c
parent07e86ccb543bb1e748f32d6f0f18913d3f58d988 (diff)
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/journal.c')
-rw-r--r--drivers/md/bcache/journal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index c871ffaabbb..21fd1010cf5 100644
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -293,9 +293,9 @@ int bch_journal_replay(struct cache_set *s, struct list_head *list,
BUG_ON(i->pin && atomic_read(i->pin) != 1);
if (n != i->j.seq)
- pr_err("journal entries %llu-%llu "
- "missing! (replaying %llu-%llu)\n",
- n, i->j.seq - 1, start, end);
+ pr_err(
+ "journal entries %llu-%llu missing! (replaying %llu-%llu)\n",
+ n, i->j.seq - 1, start, end);
for (k = i->j.start;
k < end(&i->j);
@@ -439,7 +439,7 @@ static void do_journal_discard(struct cache *ca)
bio_init(bio);
bio->bi_sector = bucket_to_sector(ca->set,
- ca->sb.d[ja->discard_idx]);
+ ca->sb.d[ja->discard_idx]);
bio->bi_bdev = ca->bdev;
bio->bi_rw = REQ_WRITE|REQ_DISCARD;
bio->bi_max_vecs = 1;