X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dir-test.c;h=cfb77f2ac3262bad1ee890d48b988f59901d4b5a;hb=a855717a87a8da78b62148e8bf0a629695596097;hp=3ae9c68bd7117ed505219b9e9d1dcaa60c604ceb;hpb=075587c96c2f39e227847d13ca0ef305b13cd7d3;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/dir-test.c b/dir-test.c
index 3ae9c68..cfb77f2 100644
--- a/dir-test.c
+++ b/dir-test.c
@@ -87,7 +87,7 @@ static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 
 	inode_map.objectid = objectid;
 	inode_map.flags = 0;
-	btrfs_set_key_type(&inode_map, BTRFS_INODE_ITEM_KEY);
+	inode_map.type = BTRFS_INODE_ITEM_KEY;
 	inode_map.offset = 0;
 
 	initial_inode_init(root, &inode_item);
@@ -133,14 +133,14 @@ error:
 		foundhash = btrfs_name_hash(found, found_len);
 		if (myhash != foundhash)
 			goto fatal_release;
-		btrfs_release_path(root, &path);
+		btrfs_release_path(&path);
 		return 0;
 	}
 fatal_release:
-	btrfs_release_path(root, &path);
+	btrfs_release_path(&path);
 fatal:
 	printf("failed to insert %lu ret %d\n", oid, ret);
-	return -1;
+	return ret;
 }
 
 static int insert_dup(struct btrfs_trans_handle *trans, struct btrfs_root
@@ -158,7 +158,7 @@ static int insert_dup(struct btrfs_trans_handle *trans, struct btrfs_root
 
 	key.objectid = file_oid;
 	key.flags = 0;
-	btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
+	key.type = BTRFS_INODE_ITEM_KEY;
 	key.offset = 0;
 	ret = btrfs_insert_dir_item(trans, root, buf, strlen(buf), dir_oid,
 				    &key, BTRFS_FT_UNKNOWN);
@@ -189,7 +189,7 @@ static int del_dir_item(struct btrfs_trans_handle *trans,
 	ret = btrfs_del_item(trans, root, path);
 	if (ret)
 		goto out_release;
-	btrfs_release_path(root, path);
+	btrfs_release_path(path);
 
 	/* delete the inode */
 	btrfs_init_path(path);
@@ -199,7 +199,7 @@ static int del_dir_item(struct btrfs_trans_handle *trans,
 	ret = btrfs_del_item(trans, root, path);
 	if (ret)
 		goto out_release;
-	btrfs_release_path(root, path);
+	btrfs_release_path(path);
 
 	if (root->fs_info->last_inode_alloc > file_objectid)
 		root->fs_info->last_inode_alloc = file_objectid;
@@ -210,10 +210,10 @@ static int del_dir_item(struct btrfs_trans_handle *trans,
 	}
 	return 0;
 out_release:
-	btrfs_release_path(root, path);
+	btrfs_release_path(path);
 out:
 	printf("failed to delete %lu %d\n", radix_index, ret);
-	return -1;
+	return ret;
 }
 
 static int del_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
@@ -239,9 +239,9 @@ static int del_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 		goto out_release;
 	return ret;
 out_release:
-	btrfs_release_path(root, &path);
+	btrfs_release_path(&path);
 	printf("failed to delete %lu %d\n", oid, ret);
-	return -1;
+	return ret;
 }
 
 static int lookup_item(struct btrfs_trans_handle *trans, struct btrfs_root
@@ -266,10 +266,10 @@ static int lookup_item(struct btrfs_trans_handle *trans, struct btrfs_root
 				    struct btrfs_dir_item);
 		objectid = btrfs_disk_key_objectid(&di->location);
 	}
-	btrfs_release_path(root, &path);
+	btrfs_release_path(&path);
 	if (ret) {
 		printf("unable to find key %lu\n", oid);
-		return -1;
+		return ret;
 	}
 	return 0;
 }
@@ -289,10 +289,10 @@ static int lookup_enoent(struct btrfs_trans_handle *trans, struct btrfs_root
 	btrfs_init_path(&path);
 	ret = btrfs_lookup_dir_item(trans, root, &path, dir_oid, buf,
 				    strlen(buf), 0);
-	btrfs_release_path(root, &path);
+	btrfs_release_path(&path);
 	if (!ret) {
 		printf("able to find key that should not exist %lu\n", oid);
-		return -1;
+		return ret;
 	}
 	return 0;
 }
@@ -312,18 +312,18 @@ static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
 
 	key.offset = (u64)-1;
 	key.flags = 0;
-	btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
+	key.type = BTRFS_DIR_ITEM_KEY;
 	key.objectid = dir_oid;
 	while(nr-- >= 0) {
 		btrfs_init_path(&path);
 		ret = btrfs_search_slot(trans, root, &key, &path, -1, 1);
 		if (ret < 0) {
-			btrfs_release_path(root, &path);
+			btrfs_release_path(&path);
 			return ret;
 		}
 		if (ret != 0) {
 			if (path.slots[0] == 0) {
-				btrfs_release_path(root, &path);
+				btrfs_release_path(&path);
 				break;
 			}
 			path.slots[0] -= 1;
@@ -342,14 +342,14 @@ static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
 			fprintf(stderr,
 				"failed to remove %lu from tree\n",
 				found);
-			return -1;
+			return ret;
 		}
 		if (!keep_running)
 			break;
 	}
 	return 0;
 	fprintf(stderr, "failed to delete from the radix %lu\n", found);
-	return -1;
+	return ret;
 }
 
 static int fill_tree(struct btrfs_trans_handle *trans, struct btrfs_root *root,
@@ -436,7 +436,14 @@ int main(int ac, char **av)
 	radix_tree_init();
 
 	root = open_ctree(av[ac-1], &super, 0);
+
+	if (!root) {
+		fprintf(stderr, "Open ctree failed\n");
+		return 1;
+	}
+
 	trans = btrfs_start_transaction(root, 1);
+	BUG_ON(IS_ERR(trans));
 
 	dir_oid = btrfs_super_root_dir(&super);
 
@@ -479,6 +486,11 @@ int main(int ac, char **av)
 				btrfs_header_nritems(&root->node->node.header));
 			close_ctree(root, &super);
 			root = open_ctree("dbfile", &super, 0);
+
+			if (!root) {
+				fprintf(stderr, "Open ctree failed\n");
+				return 1;
+			}
 		}
 		while(count--) {
 			ret = ops[op](trans, root, &radix);
@@ -501,6 +513,6 @@ int main(int ac, char **av)
 	}
 out:
 	close_ctree(root, &super);
-	return err;
+	return !!err;
 }