diff options
Diffstat (limited to 'fs/btrfs/random-test.c')
| -rw-r--r-- | fs/btrfs/random-test.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/btrfs/random-test.c b/fs/btrfs/random-test.c index 5d99b730a69c..34a15841ebd3 100644 --- a/fs/btrfs/random-test.c +++ b/fs/btrfs/random-test.c | |||
| @@ -10,7 +10,8 @@ | |||
| 10 | int keep_running = 1; | 10 | int keep_running = 1; |
| 11 | struct ctree_super_block super; | 11 | struct ctree_super_block super; |
| 12 | 12 | ||
| 13 | static int setup_key(struct radix_tree_root *root, struct key *key, int exists) | 13 | static int setup_key(struct radix_tree_root *root, struct btrfs_key *key, |
| 14 | int exists) | ||
| 14 | { | 15 | { |
| 15 | int num = rand(); | 16 | int num = rand(); |
| 16 | unsigned long res[2]; | 17 | unsigned long res[2]; |
| @@ -38,7 +39,7 @@ again: | |||
| 38 | static int ins_one(struct ctree_root *root, struct radix_tree_root *radix) | 39 | static int ins_one(struct ctree_root *root, struct radix_tree_root *radix) |
| 39 | { | 40 | { |
| 40 | struct ctree_path path; | 41 | struct ctree_path path; |
| 41 | struct key key; | 42 | struct btrfs_key key; |
| 42 | int ret; | 43 | int ret; |
| 43 | char buf[128]; | 44 | char buf[128]; |
| 44 | unsigned long oid; | 45 | unsigned long oid; |
| @@ -63,7 +64,7 @@ error: | |||
| 63 | static int insert_dup(struct ctree_root *root, struct radix_tree_root *radix) | 64 | static int insert_dup(struct ctree_root *root, struct radix_tree_root *radix) |
| 64 | { | 65 | { |
| 65 | struct ctree_path path; | 66 | struct ctree_path path; |
| 66 | struct key key; | 67 | struct btrfs_key key; |
| 67 | int ret; | 68 | int ret; |
| 68 | char buf[128]; | 69 | char buf[128]; |
| 69 | init_path(&path); | 70 | init_path(&path); |
| @@ -82,7 +83,7 @@ static int insert_dup(struct ctree_root *root, struct radix_tree_root *radix) | |||
| 82 | static int del_one(struct ctree_root *root, struct radix_tree_root *radix) | 83 | static int del_one(struct ctree_root *root, struct radix_tree_root *radix) |
| 83 | { | 84 | { |
| 84 | struct ctree_path path; | 85 | struct ctree_path path; |
| 85 | struct key key; | 86 | struct btrfs_key key; |
| 86 | int ret; | 87 | int ret; |
| 87 | unsigned long *ptr; | 88 | unsigned long *ptr; |
| 88 | init_path(&path); | 89 | init_path(&path); |
| @@ -108,7 +109,7 @@ error: | |||
| 108 | static int lookup_item(struct ctree_root *root, struct radix_tree_root *radix) | 109 | static int lookup_item(struct ctree_root *root, struct radix_tree_root *radix) |
| 109 | { | 110 | { |
| 110 | struct ctree_path path; | 111 | struct ctree_path path; |
| 111 | struct key key; | 112 | struct btrfs_key key; |
| 112 | int ret; | 113 | int ret; |
| 113 | init_path(&path); | 114 | init_path(&path); |
| 114 | ret = setup_key(radix, &key, 1); | 115 | ret = setup_key(radix, &key, 1); |
| @@ -127,7 +128,7 @@ error: | |||
| 127 | static int lookup_enoent(struct ctree_root *root, struct radix_tree_root *radix) | 128 | static int lookup_enoent(struct ctree_root *root, struct radix_tree_root *radix) |
| 128 | { | 129 | { |
| 129 | struct ctree_path path; | 130 | struct ctree_path path; |
| 130 | struct key key; | 131 | struct btrfs_key key; |
| 131 | int ret; | 132 | int ret; |
| 132 | init_path(&path); | 133 | init_path(&path); |
| 133 | ret = setup_key(radix, &key, 0); | 134 | ret = setup_key(radix, &key, 0); |
| @@ -147,7 +148,7 @@ static int empty_tree(struct ctree_root *root, struct radix_tree_root *radix, | |||
| 147 | int nr) | 148 | int nr) |
| 148 | { | 149 | { |
| 149 | struct ctree_path path; | 150 | struct ctree_path path; |
| 150 | struct key key; | 151 | struct btrfs_key key; |
| 151 | unsigned long found = 0; | 152 | unsigned long found = 0; |
| 152 | int ret; | 153 | int ret; |
| 153 | int slot; | 154 | int slot; |
| @@ -248,7 +249,7 @@ int (*ops[])(struct ctree_root *root, struct radix_tree_root *radix) = | |||
| 248 | static int fill_radix(struct ctree_root *root, struct radix_tree_root *radix) | 249 | static int fill_radix(struct ctree_root *root, struct radix_tree_root *radix) |
| 249 | { | 250 | { |
| 250 | struct ctree_path path; | 251 | struct ctree_path path; |
| 251 | struct key key; | 252 | struct btrfs_key key; |
| 252 | unsigned long found; | 253 | unsigned long found; |
| 253 | int ret; | 254 | int ret; |
| 254 | int slot; | 255 | int slot; |