From 0dfe3c9588587c4dbeeec6830231b17b3361edaf Mon Sep 17 00:00:00 2001
From: Roland Dreier <roland@purestorage.com>
Date: Thu, 7 Jun 2012 14:21:13 -0700
Subject: [PATCH] --- yaml --- r: 310554 b: refs/heads/master c:
 cbf8ae32f66a9ceb8907ad9e16663c2a29e48990 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/lib/btree.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 28f327790239..6c93e40f0ecd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d8a45695cc8f9fcdf4121fcbd897ecb63f758e4
+refs/heads/master: cbf8ae32f66a9ceb8907ad9e16663c2a29e48990
diff --git a/trunk/lib/btree.c b/trunk/lib/btree.c
index e5ec1e9c1aa5..5cf9e74ec3f3 100644
--- a/trunk/lib/btree.c
+++ b/trunk/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 @@ void *btree_get_prev(struct btree_head *head, struct btree_geo *geo,
 	}
 miss:
 	if (retry_key) {
-		__key = retry_key;
+		longcpy(key, retry_key, geo->keylen);
 		retry_key = NULL;
 		goto retry;
 	}