Add 64bit rdev APIs

I stumbled across the fact that on Linux/glibc at least `dev_t` is
64 bits, but we were truncating it to 32 bits.

Note that the type used in the `mkcomposefs` binary was already uint64_t
but because C happily truncates/converts integers this was missed.

Signed-off-by: Colin Walters <walters@verbum.org>

libcomposefs/lcfs-writer-erofs.c

@@ -1200,7 +1200,7 @@ static int add_overlay_whiteouts(struct lcfs_node_s *root)
 		}
 
 		lcfs_node_set_mode(child, S_IFCHR | 0644);
-		lcfs_node_set_rdev(child, 0);
+		lcfs_node_set_rdev64(child, 0);
 
 		child->inode.st_uid = root->inode.st_uid;
 		child->inode.st_gid = root->inode.st_gid;

libcomposefs/lcfs-writer.c

@@ -1009,16 +1009,28 @@ void lcfs_node_set_gid(struct lcfs_node_s *node, uint32_t gid)
 	node->inode.st_gid = gid;
 }
 
+// Deprecated: this truncates rdev to 32 bits
 uint32_t lcfs_node_get_rdev(struct lcfs_node_s *node)
+{
+	return (uint32_t)lcfs_node_get_rdev64(node);
+}
+
+uint64_t lcfs_node_get_rdev64(struct lcfs_node_s *node)
 {
 	return node->inode.st_rdev;
 }
 
+// Deprecated: this truncates rdev to 32 bits
 void lcfs_node_set_rdev(struct lcfs_node_s *node, uint32_t rdev)
 {
 	node->inode.st_rdev = rdev;
 }
 
+void lcfs_node_set_rdev64(struct lcfs_node_s *node, uint64_t rdev)
+{
+	node->inode.st_rdev = rdev;
+}
+
 uint32_t lcfs_node_get_nlink(struct lcfs_node_s *node)
 {
 	return node->inode.st_nlink;

libcomposefs/lcfs-writer.h

@@ -136,7 +136,9 @@ LCFS_EXTERN void lcfs_node_set_uid(struct lcfs_node_s *node, uint32_t uid);
 LCFS_EXTERN uint32_t lcfs_node_get_gid(struct lcfs_node_s *node);
 LCFS_EXTERN void lcfs_node_set_gid(struct lcfs_node_s *node, uint32_t gid);
 LCFS_EXTERN uint32_t lcfs_node_get_rdev(struct lcfs_node_s *node);
+LCFS_EXTERN uint64_t lcfs_node_get_rdev64(struct lcfs_node_s *node);
 LCFS_EXTERN void lcfs_node_set_rdev(struct lcfs_node_s *node, uint32_t rdev);
+LCFS_EXTERN void lcfs_node_set_rdev64(struct lcfs_node_s *node, uint64_t rdev);
 LCFS_EXTERN uint32_t lcfs_node_get_nlink(struct lcfs_node_s *node);
 LCFS_EXTERN void lcfs_node_set_nlink(struct lcfs_node_s *node, uint32_t nlink);
 LCFS_EXTERN uint64_t lcfs_node_get_size(struct lcfs_node_s *node);

tools/mkcomposefs.c

@@ -512,7 +512,7 @@ static char *tree_from_dump_line(dump_info *info, const char *line, size_t line_
 	lcfs_node_set_nlink(node, nlink);
 	lcfs_node_set_uid(node, uid);
 	lcfs_node_set_gid(node, gid);
-	lcfs_node_set_rdev(node, rdev);
+	lcfs_node_set_rdev64(node, rdev);
 	lcfs_node_set_mtime(node, &mtime);
 	// Validate that symlinks are non-empty
 	if ((mode & S_IFMT) == S_IFLNK) {