projects
/
platform
/
upstream
/
btrfs-progs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs-progs: convert: Fix inline file extent creation condition
[platform/upstream/btrfs-progs.git]
/
random-test.c
diff --git
a/random-test.c
b/random-test.c
index
2f44593
..
d5f830a
100644
(file)
--- a/
random-test.c
+++ b/
random-test.c
@@
-37,13
+37,13
@@
static int setup_key(struct radix_tree_root *root, struct btrfs_key *key,
int ret;
key->flags = 0;
int ret;
key->flags = 0;
-
btrfs_set_key_type(key, BTRFS_STRING_ITEM_KEY)
;
+
key->type = BTRFS_STRING_ITEM_KEY
;
key->offset = 0;
again:
ret = radix_tree_gang_lookup(root, (void **)res, num, 2);
if (exists) {
if (ret == 0)
key->offset = 0;
again:
ret = radix_tree_gang_lookup(root, (void **)res, num, 2);
if (exists) {
if (ret == 0)
- return -
1
;
+ return -
EEXIST
;
num = res[0];
} else if (ret != 0 && num == res[0]) {
num++;
num = res[0];
} else if (ret != 0 && num == res[0]) {
num++;
@@
-79,7
+79,7
@@
static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
return ret;
error:
printf("failed to insert %llu\n", (unsigned long long)key.objectid);
return ret;
error:
printf("failed to insert %llu\n", (unsigned long long)key.objectid);
- return
-1
;
+ return
ret
;
}
static int insert_dup(struct btrfs_trans_handle *trans, struct btrfs_root
}
static int insert_dup(struct btrfs_trans_handle *trans, struct btrfs_root
@@
-98,7
+98,7
@@
static int insert_dup(struct btrfs_trans_handle *trans, struct btrfs_root
if (ret != -EEXIST) {
printf("insert on %llu gave us %d\n",
(unsigned long long)key.objectid, ret);
if (ret != -EEXIST) {
printf("insert on %llu gave us %d\n",
(unsigned long long)key.objectid, ret);
- return
1
;
+ return
ret
;
}
return 0;
}
}
return 0;
}
@@
-127,7
+127,7
@@
static int del_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
return 0;
error:
printf("failed to delete %llu\n", (unsigned long long)key.objectid);
return 0;
error:
printf("failed to delete %llu\n", (unsigned long long)key.objectid);
- return
-1
;
+ return
ret
;
}
static int lookup_item(struct btrfs_trans_handle *trans, struct btrfs_root
}
static int lookup_item(struct btrfs_trans_handle *trans, struct btrfs_root
@@
-147,7
+147,7
@@
static int lookup_item(struct btrfs_trans_handle *trans, struct btrfs_root
return 0;
error:
printf("unable to find key %llu\n", (unsigned long long)key.objectid);
return 0;
error:
printf("unable to find key %llu\n", (unsigned long long)key.objectid);
- return
-1
;
+ return
ret
;
}
static int lookup_enoent(struct btrfs_trans_handle *trans, struct btrfs_root
}
static int lookup_enoent(struct btrfs_trans_handle *trans, struct btrfs_root
@@
-168,7
+168,7
@@
static int lookup_enoent(struct btrfs_trans_handle *trans, struct btrfs_root
error:
printf("able to find key that should not exist %llu\n",
(unsigned long long)key.objectid);
error:
printf("able to find key that should not exist %llu\n",
(unsigned long long)key.objectid);
- return -
1
;
+ return -
EEXIST
;
}
static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
}
static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
@@
-184,7
+184,7
@@
static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
key.offset = 0;
key.flags = 0;
key.offset = 0;
key.flags = 0;
-
btrfs_set_key_type(&key, BTRFS_STRING_ITEM_KEY)
;
+
key.type = BTRFS_STRING_ITEM_KEY
;
key.objectid = (unsigned long)-1;
while(nr-- >= 0) {
btrfs_init_path(&path);
key.objectid = (unsigned long)-1;
while(nr-- >= 0) {
btrfs_init_path(&path);
@@
-209,7
+209,7
@@
static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
fprintf(stderr,
"failed to remove %lu from tree\n",
found);
fprintf(stderr,
"failed to remove %lu from tree\n",
found);
- return
-1
;
+ return
ret
;
}
btrfs_release_path(&path);
ptr = radix_tree_delete(radix, found);
}
btrfs_release_path(&path);
ptr = radix_tree_delete(radix, found);
@@
-221,7
+221,7
@@
static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
return 0;
error:
fprintf(stderr, "failed to delete from the radix %lu\n", found);
return 0;
error:
fprintf(stderr, "failed to delete from the radix %lu\n", found);
- return -
1
;
+ return -
ENOENT
;
}
static int fill_tree(struct btrfs_trans_handle *trans, struct btrfs_root *root,
}
static int fill_tree(struct btrfs_trans_handle *trans, struct btrfs_root *root,
@@
-288,7
+288,7
@@
static int fill_radix(struct btrfs_root *root, struct radix_tree_root *radix)
key.offset = 0;
key.flags = 0;
key.offset = 0;
key.flags = 0;
-
btrfs_set_key_type(&key, BTRFS_STRING_ITEM_KEY)
;
+
key.type = BTRFS_STRING_ITEM_KEY
;
key.objectid = (unsigned long)-1;
while(1) {
btrfs_init_path(&path);
key.objectid = (unsigned long)-1;
while(1) {
btrfs_init_path(&path);
@@
-380,6
+380,7
@@
int main(int ac, char **av)
}
printf("initial fill\n");
trans = btrfs_start_transaction(root, 1);
}
printf("initial fill\n");
trans = btrfs_start_transaction(root, 1);
+ BUG_ON(IS_ERR(trans));
ret = fill_tree(trans, root, &radix, init_fill_count);
printf("starting run\n");
if (ret) {
ret = fill_tree(trans, root, &radix, init_fill_count);
printf("starting run\n");
if (ret) {
@@
-428,6
+429,6
@@
int main(int ac, char **av)
}
out:
close_ctree(root, &super);
}
out:
close_ctree(root, &super);
- return err;
+ return
!!
err;
}
}