|
@@ -1933,6 +1933,7 @@ static noinline int copy_to_sk(struct btrfs_root *root,
|
|
|
u64 found_transid;
|
|
|
struct extent_buffer *leaf;
|
|
|
struct btrfs_ioctl_search_header sh;
|
|
|
+ struct btrfs_key test;
|
|
|
unsigned long item_off;
|
|
|
unsigned long item_len;
|
|
|
int nritems;
|
|
@@ -2016,12 +2017,17 @@ static noinline int copy_to_sk(struct btrfs_root *root,
|
|
|
}
|
|
|
advance_key:
|
|
|
ret = 0;
|
|
|
- if (key->offset < (u64)-1 && key->offset < sk->max_offset)
|
|
|
+ test.objectid = sk->max_objectid;
|
|
|
+ test.type = sk->max_type;
|
|
|
+ test.offset = sk->max_offset;
|
|
|
+ if (btrfs_comp_cpu_keys(key, &test) >= 0)
|
|
|
+ ret = 1;
|
|
|
+ else if (key->offset < (u64)-1)
|
|
|
key->offset++;
|
|
|
- else if (key->type < (u8)-1 && key->type < sk->max_type) {
|
|
|
+ else if (key->type < (u8)-1) {
|
|
|
key->offset = 0;
|
|
|
key->type++;
|
|
|
- } else if (key->objectid < (u64)-1 && key->objectid < sk->max_objectid) {
|
|
|
+ } else if (key->objectid < (u64)-1) {
|
|
|
key->offset = 0;
|
|
|
key->type = 0;
|
|
|
key->objectid++;
|