cleanup: remove squashfs type from fstree nodes

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

2 files changed, 1 insertions, 15 deletions

diff --git a/include/fstree.h b/include/fstree.h
index 27cb39d..6a29093 100644
--- a/include/fstree.h
+++ b/include/fstree.h
@@ -133,20 +133,6 @@ struct tree_node_t {
 	/* Inode number. Generated on the fly when writing inodes. */
 	uint32_t inode_num;
 
-	/* SquashFS inode type used for this tree node.
-
-	   Generated on the fly when writing inodes. It can't be easily
-	   determined in advance since it depends also on the size of the
-	   node, which means for directories the size of the directory
-	   entries once written to disk.
-
-	   All code that actually processes tree nodes should use the mode
-	   field instead (mode & S_IFMT gives us the node type). It is stored
-	   here when generating inodes since we need it later on to generate
-	   directory entries.
-	*/
-	int type;
-
 	/* Type specific data. Pointers are into payload area blow. */
 	union {
 		dir_info_t *dir;
diff --git a/include/squashfs.h b/include/squashfs.h
index f9df73d..ed3fd38 100644
--- a/include/squashfs.h
+++ b/include/squashfs.h
@@ -13,7 +13,7 @@
 #define SQFS_DEVBLK_SIZE 4096
 #define SQFS_MAX_DIR_ENT 256
 
-#define SQFS_DIR_TYPE_MOD 8
+#define SQFS_INODE_EXT_TYPE(type) ((type) - 1 + 8)
 
 typedef struct {
 	uint32_t magic;