Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse 2006-05-04 17:50:04 +01:00
parent cb8c1fdc0c
commit 05f75fd3bb

View file

@ -1,13 +1,7 @@
#ifndef __CRAMFS_H #ifndef __CRAMFS_H
#define __CRAMFS_H #define __CRAMFS_H
#ifndef __KERNEL__ #include <linux/types.h>
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
#endif
#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
#define CRAMFS_SIGNATURE "Compressed ROMFS" #define CRAMFS_SIGNATURE "Compressed ROMFS"
@ -33,9 +27,9 @@ typedef unsigned int u32;
* Reasonably terse representation of the inode data. * Reasonably terse representation of the inode data.
*/ */
struct cramfs_inode { struct cramfs_inode {
u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH; __u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
/* SIZE for device files is i_rdev */ /* SIZE for device files is i_rdev */
u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH; __u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
/* NAMELEN is the length of the file name, divided by 4 and /* NAMELEN is the length of the file name, divided by 4 and
rounded up. (cramfs doesn't support hard links.) */ rounded up. (cramfs doesn't support hard links.) */
/* OFFSET: For symlinks and non-empty regular files, this /* OFFSET: For symlinks and non-empty regular files, this
@ -44,27 +38,27 @@ struct cramfs_inode {
see README). For non-empty directories it is the offset see README). For non-empty directories it is the offset
(divided by 4) of the inode of the first file in that (divided by 4) of the inode of the first file in that
directory. For anything else, offset is zero. */ directory. For anything else, offset is zero. */
u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH; __u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
}; };
struct cramfs_info { struct cramfs_info {
u32 crc; __u32 crc;
u32 edition; __u32 edition;
u32 blocks; __u32 blocks;
u32 files; __u32 files;
}; };
/* /*
* Superblock information at the beginning of the FS. * Superblock information at the beginning of the FS.
*/ */
struct cramfs_super { struct cramfs_super {
u32 magic; /* 0x28cd3d45 - random number */ __u32 magic; /* 0x28cd3d45 - random number */
u32 size; /* length in bytes */ __u32 size; /* length in bytes */
u32 flags; /* feature flags */ __u32 flags; /* feature flags */
u32 future; /* reserved for future use */ __u32 future; /* reserved for future use */
u8 signature[16]; /* "Compressed ROMFS" */ __u8 signature[16]; /* "Compressed ROMFS" */
struct cramfs_info fsid; /* unique filesystem info */ struct cramfs_info fsid; /* unique filesystem info */
u8 name[16]; /* user-defined name */ __u8 name[16]; /* user-defined name */
struct cramfs_inode root; /* root inode data */ struct cramfs_inode root; /* root inode data */
}; };