diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-21 16:45:33 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-06-21 16:45:33 +0200 |
| commit | 206f021b91066de1406a9a657237968dfea6b746 (patch) | |
| tree | 7638b98fe5d16eccfe283731c534c93037ec6056 /lib | |
| parent | 8b6cf85427366305cde6adb56e40e14440b576f4 (diff) | |
| parent | 839cf7a236278ae358ff12141a168c0982fa0cd9 (diff) | |
| download | kernel_samsung_crespo-206f021b91066de1406a9a657237968dfea6b746.zip kernel_samsung_crespo-206f021b91066de1406a9a657237968dfea6b746.tar.gz kernel_samsung_crespo-206f021b91066de1406a9a657237968dfea6b746.tar.bz2 | |
Merge branch 'linux-3.0.y' into HEAD
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/btree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/btree.c b/lib/btree.c index 2a34392..297124d 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; } |