Btrfs-progs: fix magic return value in random-test.c

Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Wang Shilong 2013-09-04 23:22:34 +08:00 committed by Chris Mason
parent 5f00e770f8
commit 0497edae9f

View File

@ -43,7 +43,7 @@ again:
ret = radix_tree_gang_lookup(root, (void **)res, num, 2); ret = radix_tree_gang_lookup(root, (void **)res, num, 2);
if (exists) { if (exists) {
if (ret == 0) if (ret == 0)
return -1; return -EEXIST;
num = res[0]; num = res[0];
} else if (ret != 0 && num == res[0]) { } else if (ret != 0 && num == res[0]) {
num++; num++;
@ -79,7 +79,7 @@ static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
return ret; return ret;
error: error:
printf("failed to insert %llu\n", (unsigned long long)key.objectid); 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) { if (ret != -EEXIST) {
printf("insert on %llu gave us %d\n", printf("insert on %llu gave us %d\n",
(unsigned long long)key.objectid, ret); (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; return 0;
error: error:
printf("failed to delete %llu\n", (unsigned long long)key.objectid); 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; return 0;
error: error:
printf("unable to find key %llu\n", (unsigned long long)key.objectid); 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: error:
printf("able to find key that should not exist %llu\n", printf("able to find key that should not exist %llu\n",
(unsigned long long)key.objectid); (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
@ -209,7 +209,7 @@ static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
fprintf(stderr, fprintf(stderr,
"failed to remove %lu from tree\n", "failed to remove %lu from tree\n",
found); found);
return -1; return ret;
} }
btrfs_release_path(&path); btrfs_release_path(&path);
ptr = radix_tree_delete(radix, found); ptr = radix_tree_delete(radix, found);
@ -221,7 +221,7 @@ static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
return 0; return 0;
error: error:
fprintf(stderr, "failed to delete from the radix %lu\n", found); 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,
@ -428,6 +428,6 @@ int main(int ac, char **av)
} }
out: out:
close_ctree(root, &super); close_ctree(root, &super);
return err; return !!err;
} }