diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-19 16:23:52 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-19 16:23:52 (GMT) |
| commit | 1bc38a1d33a09949cfb6a12349e3c8dac867a5ab (patch) | |
| tree | e3fa41f522857e3416854368b59e2e08c571f55d /drivers/md/bcache/btree.c | |
| parent | ddf2965d77558eefee745c9dce22ad7ef5c7b88e (diff) | |
| parent | a92444c6b2225a9115d661c950cb48a22aeace20 (diff) | |
| download | linux-1bc38a1d33a09949cfb6a12349e3c8dac867a5ab.tar.xz | |
Merge branch 'irq/for-arm' into irq/core
Pull the functionality which is required to cleanup sdhci/sdio
in. It's in a separate branch so it can be pulled from others
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 98cc0a8..5f9c2a6 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 |