Index: linux-2.6.9/fs/yaffs/yaffs_guts.h
===================================================================
--- linux-2.6.9.orig/fs/yaffs/yaffs_guts.h
+++ linux-2.6.9/fs/yaffs/yaffs_guts.h
@@ -181,16 +181,17 @@
 	YAFFS_OBJECT_TYPE_DIRECTORY,
 	YAFFS_OBJECT_TYPE_HARDLINK,
 	YAFFS_OBJECT_TYPE_SPECIAL
-} yaffs_ObjectType;
+} yaffs_ObjectType __attribute__ ((__mode__ (__SI__)));
 
 typedef struct
 {
 	yaffs_ObjectType type;
 
 	// Apply to everything	
-	int   parentObjectId;
+	__s32 parentObjectId;
 	__u16 sum__NoLongerUsed;	// checksum of name. Calc this off the name to prevent inconsistencies
 	char  name[YAFFS_MAX_NAME_LENGTH + 1];
+	char  pad[2];
 
 	// Thes following apply to directories, files, symlinks - not hard links
 	__u32 st_mode;  // protection
@@ -206,10 +207,10 @@
 #endif
 
 	// File size  applies to files only
-	int fileSize; 
+	__s32 fileSize; 
 		
 	// Equivalent object id applies to hard links only.
-	int  equivalentObjectId;
+	__s32 equivalentObjectId;
 	
 	// Alias is for symlinks only.
 	char alias[YAFFS_MAX_ALIAS_LENGTH + 1];