diff options
| author | Jens Axboe <axboe@kernel.dk> | 2014-01-30 12:57:55 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2014-01-30 12:57:55 -0700 |
| commit | 96d2e8b5e288e9d2a40b95161b855944846526a5 (patch) | |
| tree | 1fba4e0da90fb2727ba1c121d76dd363c29759f2 /drivers/md/bcache/btree.c | |
| parent | 556ee818c06f37b2e583af0363e6b16d0e0270de (diff) | |
| parent | e3b4825b85eab879b618af6ea18529ca7ab9a64f (diff) | |
Merge branch 'bcache-for-3.14' of git://evilpiepirate.org/~kent/linux-bcache into for-linus
Diffstat (limited to 'drivers/md/bcache/btree.c')
| -rw-r--r-- | drivers/md/bcache/btree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 98cc0a810a3..5f9c2a665ca 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -1167,7 +1167,7 @@ uint8_t __bch_btree_mark_key(struct cache_set *c, int level, struct bkey *k) /* guard against overflow */ SET_GC_SECTORS_USED(g, min_t(unsigned, GC_SECTORS_USED(g) + KEY_SIZE(k), - (1 << 14) - 1)); + MAX_GC_SECTORS_USED)); BUG_ON(!GC_SECTORS_USED(g)); } @@ -1805,7 +1805,7 @@ static bool btree_insert_key(struct btree *b, struct bkey *k, static size_t insert_u64s_remaining(struct btree *b) { - ssize_t ret = bch_btree_keys_u64s_remaining(&b->keys); + long ret = bch_btree_keys_u64s_remaining(&b->keys); /* * Might land in the middle of an existing extent and have to split it |