diff options
| author | Hirofumi Ogawa <hirofumi@mail.parknet.co.jp> | 2002-03-17 19:00:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-03-17 19:00:01 -0800 |
| commit | 9285a3a7d64c64e46a232ef23aa42b2f550a13e1 (patch) | |
| tree | f5fe9938c18e9aef6c5b3a41f5ec6947027e600d | |
| parent | 198231a8fb86b3603a7d12ac72c6a74801594db0 (diff) | |
[PATCH] Fix linux/msdos_fs.h for userland (1/2)
The following patch moves MSDOS_SB() and MSDOS_I() into #define
__KERNEL__.
| -rw-r--r-- | include/linux/msdos_fs.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h index 022e7a89d98a..e272d75bc1fd 100644 --- a/include/linux/msdos_fs.h +++ b/include/linux/msdos_fs.h @@ -4,9 +4,6 @@ /* * The MS-DOS filesystem constants/structures */ -#include <linux/msdos_fs_i.h> -#include <linux/msdos_fs_sb.h> - #include <asm/byteorder.h> #define MSDOS_ROOT_INO 1 /* == MINIX_ROOT_INO */ @@ -54,16 +51,6 @@ #define MSDOS_VALID_MODE (S_IFREG | S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO) /* valid file mode bits */ -static inline struct msdos_sb_info *MSDOS_SB(struct super_block *sb) -{ - return sb->u.generic_sbp; -} - -static inline struct msdos_inode_info *MSDOS_I(struct inode *inode) -{ - return list_entry(inode, struct msdos_inode_info, vfs_inode); -} - #define MSDOS_NAME 11 /* maximum name length */ #define MSDOS_LONGNAME 256 /* maximum name length */ #define MSDOS_SLOTS 21 /* max # of slots needed for short and long names */ @@ -196,6 +183,18 @@ struct vfat_slot_info { #ifdef __KERNEL__ #include <linux/nls.h> +#include <linux/msdos_fs_i.h> +#include <linux/msdos_fs_sb.h> + +static inline struct msdos_sb_info *MSDOS_SB(struct super_block *sb) +{ + return sb->u.generic_sbp; +} + +static inline struct msdos_inode_info *MSDOS_I(struct inode *inode) +{ + return list_entry(inode, struct msdos_inode_info, vfs_inode); +} struct fat_cache { struct super_block *sb; /* fs in question. NULL means unused */ |