diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2012-06-11 10:51:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-11 10:51:35 +0200 |
| commit | c3e228d59bd2054fd57f7f146ef0f6fb0e1996b7 (patch) | |
| tree | 1817910408fa7b5027e463725a6eb54933c71928 /lib/btree.c | |
| parent | uprobes: Pass probed vaddr to arch_uprobe_analyze_insn() (diff) | |
| parent | Linux 3.5-rc2 (diff) | |
| download | wireguard-linux-c3e228d59bd2054fd57f7f146ef0f6fb0e1996b7.tar.xz wireguard-linux-c3e228d59bd2054fd57f7f146ef0f6fb0e1996b7.zip | |
Merge tag 'v3.5-rc2' into perf/core
Merge in Linux 3.5-rc2 - to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/btree.c')
| -rw-r--r-- | lib/btree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/btree.c b/lib/btree.c index e5ec1e9c1aa5..f9a484676cb6 100644 --- a/lib/btree.c +++ b/lib/btree.c @@ -319,8 +319,8 @@ void *btree_get_prev(struct btree_head *head, struct btree_geo *geo, if (head->height == 0) return NULL; -retry: longcpy(key, __key, geo->keylen); +retry: dec_key(geo, key); node = head->node; @@ -351,7 +351,7 @@ retry: } miss: if (retry_key) { - __key = retry_key; + longcpy(key, retry_key, geo->keylen); retry_key = NULL; goto retry; } @@ -509,6 +509,7 @@ retry: int btree_insert(struct btree_head *head, struct btree_geo *geo, unsigned long *key, void *val, gfp_t gfp) { + BUG_ON(!val); return btree_insert_level(head, geo, key, val, 1, gfp); } EXPORT_SYMBOL_GPL(btree_insert); |