diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2014-01-10 18:53:02 -0800 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2014-01-29 13:06:41 -0800 |
| commit | 3572324af0f4ef877545e5a17bd3e788551f166a (patch) | |
| tree | 4cbbbae7f3217ed0af9fae06381f2b854915ba06 /drivers/md/bcache/bset.c | |
| parent | 947174476701fbc84ea8c7ec9664270f9d80b076 (diff) | |
| download | op-kernel-dev-3572324af0f4ef877545e5a17bd3e788551f166a.zip op-kernel-dev-3572324af0f4ef877545e5a17bd3e788551f166a.tar.gz | |
bcache: Minor fixes from kbuild robot
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/bset.c')
| -rw-r--r-- | drivers/md/bcache/bset.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c index 4f6b594..3f74b4b 100644 --- a/drivers/md/bcache/bset.c +++ b/drivers/md/bcache/bset.c @@ -23,7 +23,7 @@ void bch_dump_bset(struct btree_keys *b, struct bset *i, unsigned set) for (k = i->start; k < bset_bkey_last(i); k = next) { next = bkey_next(k); - printk(KERN_ERR "block %u key %zi/%u: ", set, + printk(KERN_ERR "block %u key %li/%u: ", set, (uint64_t *) k - i->d, i->keys); if (b->ops->key_dump) @@ -1185,9 +1185,12 @@ static void __btree_sort(struct btree_keys *b, struct btree_iter *iter, struct bset *out = (void *) __get_free_pages(__GFP_NOWARN|GFP_NOIO, order); if (!out) { + struct page *outp; + BUG_ON(order > state->page_order); - out = page_address(mempool_alloc(state->pool, GFP_NOIO)); + outp = mempool_alloc(state->pool, GFP_NOIO); + out = page_address(outp); used_mempool = true; order = state->page_order; } |
