summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorVarun Wadekar <vwadekar@nvidia.com>2012-07-09 16:17:52 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2012-07-09 16:17:52 +0530
commita71cc679dd9dccfe62ecd8c8a95bd510719541bf (patch)
treefed481a688ec16a6159d4af5d13c4a4003cdb121 /lib
parent17552bd68071f74c82438b86dbd9dcd419379c03 (diff)
parentff74ae50f01ee67764564815c023c362c87ce18b (diff)
Merge commit 'v3.4.4' into android-tegra-nv-3.4
Diffstat (limited to 'lib')
-rw-r--r--lib/btree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/btree.c b/lib/btree.c
index e5ec1e9c1aa5..5cf9e74ec3f3 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;
}