summaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/extents.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2014-01-30 12:57:55 -0700
committerJens Axboe <axboe@kernel.dk>2014-01-30 12:57:55 -0700
commit96d2e8b5e288e9d2a40b95161b855944846526a5 (patch)
tree1fba4e0da90fb2727ba1c121d76dd363c29759f2 /drivers/md/bcache/extents.c
parent556ee818c06f37b2e583af0363e6b16d0e0270de (diff)
parente3b4825b85eab879b618af6ea18529ca7ab9a64f (diff)
Merge branch 'bcache-for-3.14' of git://evilpiepirate.org/~kent/linux-bcache into for-linus
Diffstat (limited to 'drivers/md/bcache/extents.c')
-rw-r--r--drivers/md/bcache/extents.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bcache/extents.c b/drivers/md/bcache/extents.c
index c3ead586dc2..416d1a3e028 100644
--- a/drivers/md/bcache/extents.c
+++ b/drivers/md/bcache/extents.c
@@ -194,7 +194,7 @@ err:
mutex_unlock(&b->c->bucket_lock);
bch_extent_to_text(buf, sizeof(buf), k);
btree_bug(b,
-"inconsistent btree pointer %s: bucket %li pin %i prio %i gen %i last_gc %i mark %llu gc_gen %i",
+"inconsistent btree pointer %s: bucket %zi pin %i prio %i gen %i last_gc %i mark %llu gc_gen %i",
buf, 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;