mtd/util mkfs.jffs2.c,1.32,1.33

[David Woodhouse]

Update of /home/cvs/mtd/util
In directory phoenix.infradead.org:/tmp/cvs-serv23221

Modified Files:
	mkfs.jffs2.c 
Log Message:
Build with new kernel code

Index: mkfs.jffs2.c
===================================================================
RCS file: /home/cvs/mtd/util/mkfs.jffs2.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mkfs.jffs2.c	12 Jan 2003 15:42:04 -0000	1.32
+++ mkfs.jffs2.c	4 Feb 2003 00:37:44 -0000	1.33
@@ -67,6 +67,12 @@
 #undef crc32
 #include "crc32.h"
 
+#ifdef __linux__
+#define os_to_jffs2_mode(x) (x)
+#else
+#error You need to define your mode_t mapping
+#endif
+
 /* Do not use the wierd XPG version of basename */
 #undef basename
 
@@ -820,7 +826,7 @@
 	ri.nodetype = cpu_to_je16(JFFS2_NODETYPE_INODE);
 
 	ri.ino = cpu_to_je32(statbuf->st_ino);
-	ri.mode = cpu_to_je32(statbuf->st_mode);
+	ri.mode = cpu_to_jemode(statbuf->st_mode);
 	ri.uid = cpu_to_je16(statbuf->st_uid);
 	ri.gid = cpu_to_je16(statbuf->st_gid);
 	ri.atime = cpu_to_je32(statbuf->st_atime);
@@ -922,7 +928,7 @@
 				&ri, sizeof(struct jffs2_unknown_node) - 4));
 
 	ri.ino = cpu_to_je32(statbuf->st_ino);
-	ri.mode = cpu_to_je32(statbuf->st_mode);
+	ri.mode = cpu_to_jemode(statbuf->st_mode);
 	ri.uid = cpu_to_je16(statbuf->st_uid);
 	ri.gid = cpu_to_je16(statbuf->st_gid);
 	ri.atime = cpu_to_je32(statbuf->st_atime);
@@ -964,7 +970,7 @@
 				&ri, sizeof(struct jffs2_unknown_node) - 4));
 
 	ri.ino = cpu_to_je32(statbuf->st_ino);
-	ri.mode = cpu_to_je32(statbuf->st_mode);
+	ri.mode = cpu_to_jemode(statbuf->st_mode);
 	ri.uid = cpu_to_je16(statbuf->st_uid);
 	ri.gid = cpu_to_je16(statbuf->st_gid);
 	ri.atime = cpu_to_je32(statbuf->st_atime);
@@ -1004,7 +1010,7 @@
 				&ri, sizeof(struct jffs2_unknown_node) - 4));
 
 	ri.ino = cpu_to_je32(statbuf->st_ino);
-	ri.mode = cpu_to_je32(statbuf->st_mode);
+	ri.mode = cpu_to_jemode(statbuf->st_mode);
 	ri.uid = cpu_to_je16(statbuf->st_uid);
 	ri.gid = cpu_to_je16(statbuf->st_gid);
 	ri.atime = cpu_to_je32(statbuf->st_atime);