6 files changed, 6 insertions, 13 deletions
diff --git a/lib/fstree/test/add_by_path.c b/lib/fstree/test/add_by_path.c
index b9f4b75..d59467c 100644
--- a/lib/fstree/test/add_by_path.c
+++ b/lib/fstree/test/add_by_path.c
@@ -13,10 +13,9 @@
 static sqfs_dir_entry_t *mkentry(const char *name, sqfs_u16 mode, sqfs_u32 uid,
 			    sqfs_u32 gid)
 {
-	sqfs_dir_entry_t *ent = dir_entry_create(name);
+	sqfs_dir_entry_t *ent = sqfs_dir_entry_create(name, mode, 0);
 
 	TEST_NOT_NULL(ent);
-	ent->mode = mode;
 	ent->uid = uid;
 	ent->gid = gid;
 	return ent;
diff --git a/lib/fstree/test/fstree_sort.c b/lib/fstree/test/fstree_sort.c
index 6f20ce7..a5f83ac 100644
--- a/lib/fstree/test/fstree_sort.c
+++ b/lib/fstree/test/fstree_sort.c
@@ -12,11 +12,10 @@
 
 static tree_node_t *mkentry(fstree_t *fs, const char *name)
 {
-	sqfs_dir_entry_t *ent = dir_entry_create(name);
+	sqfs_dir_entry_t *ent = sqfs_dir_entry_create(name, S_IFBLK | 0600, 0);
 	tree_node_t *out;
 
 	TEST_NOT_NULL(ent);
-	ent->mode = S_IFBLK | 0600;
 	ent->rdev = 1337;
 
 	out = fstree_add_generic(fs, ent, NULL);
diff --git a/lib/fstree/test/gen_inode_numbers.c b/lib/fstree/test/gen_inode_numbers.c
index 34d8322..1a3ec4c 100644
--- a/lib/fstree/test/gen_inode_numbers.c
+++ b/lib/fstree/test/gen_inode_numbers.c
@@ -12,12 +12,10 @@
 
 static tree_node_t *gen_node(fstree_t *fs, const char *path)
 {
-	sqfs_dir_entry_t *ent = dir_entry_create(path);
+	sqfs_dir_entry_t *ent = sqfs_dir_entry_create(path, S_IFDIR | 0755, 0);
 	tree_node_t *ret;
 
 	TEST_NOT_NULL(ent);
-	ent->mode = S_IFDIR | 0755;
-
 	ret = fstree_add_generic(fs, ent, NULL);
 	free(ent);
 	return ret;
diff --git a/lib/fstree/test/get_path.c b/lib/fstree/test/get_path.c
index f248c79..57eb5ab 100644
--- a/lib/fstree/test/get_path.c
+++ b/lib/fstree/test/get_path.c
@@ -12,9 +12,8 @@
 
 static sqfs_dir_entry_t *mkentry(const char *name)
 {
-	sqfs_dir_entry_t *ent = dir_entry_create(name);
+	sqfs_dir_entry_t *ent = sqfs_dir_entry_create(name, S_IFDIR | 0750, 0);
 	TEST_NOT_NULL(ent);
-	ent->mode = S_IFDIR | 0750;
 	ent->uid = 1000;
 	ent->gid = 100;
 	return ent;
diff --git a/lib/fstree/test/mknode_dir.c b/lib/fstree/test/mknode_dir.c
index f852706..08a1b13 100644
--- a/lib/fstree/test/mknode_dir.c
+++ b/lib/fstree/test/mknode_dir.c
@@ -11,9 +11,8 @@
 
 static sqfs_dir_entry_t *mkentry(const char *name)
 {
-	sqfs_dir_entry_t *ent = dir_entry_create(name);
+	sqfs_dir_entry_t *ent = sqfs_dir_entry_create(name, S_IFDIR | 0654, 0);
 	TEST_NOT_NULL(ent);
-	ent->mode = S_IFDIR | 0654;
 	ent->uid = 123;
 	ent->gid = 456;
 	ent->rdev = 789;
diff --git a/lib/fstree/test/mknode_simple.c b/lib/fstree/test/mknode_simple.c
index d871c5a..5af6d5f 100644
--- a/lib/fstree/test/mknode_simple.c
+++ b/lib/fstree/test/mknode_simple.c
@@ -11,9 +11,8 @@
 
 static sqfs_dir_entry_t *mkentry(const char *name, sqfs_u16 mode)
 {
-	sqfs_dir_entry_t *ent = dir_entry_create(name);
+	sqfs_dir_entry_t *ent = sqfs_dir_entry_create(name, mode | 0654, 0);
 	TEST_NOT_NULL(ent);
-	ent->mode = mode | 0654;
 	ent->uid = 123;
 	ent->gid = 456;
 	ent->rdev = 789;