diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 2 | ||||
| -rw-r--r-- | include/linux/hfs_fs.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index cab76452160c..a1ae91bafcfc 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -651,7 +651,6 @@ struct quota_mount_options #include <linux/affs_fs_sb.h> #include <linux/ufs_fs_sb.h> #include <linux/romfs_fs_sb.h> -#include <linux/hfs_fs_sb.h> #include <linux/adfs_fs_sb.h> #include <linux/reiserfs_fs_sb.h> #include <linux/bfs_fs_sb.h> @@ -697,7 +696,6 @@ struct super_block { struct affs_sb_info affs_sb; struct ufs_sb_info ufs_sb; struct romfs_sb_info romfs_sb; - struct hfs_sb_info hfs_sb; struct adfs_sb_info adfs_sb; struct reiserfs_sb_info reiserfs_sb; struct bfs_sb_info bfs_sb; diff --git a/include/linux/hfs_fs.h b/include/linux/hfs_fs.h index f6272708f041..c0acee5f5f4b 100644 --- a/include/linux/hfs_fs.h +++ b/include/linux/hfs_fs.h @@ -318,12 +318,17 @@ extern int hfs_mac2triv(char *, const struct hfs_name *); extern void hfs_tolower(unsigned char *, int); #include <linux/hfs_fs_i.h> +#include <linux/hfs_fs_sb.h> static inline struct hfs_inode_info *HFS_I(struct inode *inode) { return list_entry(inode, struct hfs_inode_info, vfs_inode); } -#define HFS_SB(X) (&((X)->u.hfs_sb)) + +static inline struct hfs_sb_info *HFS_SB(struct super_block *sb) +{ + return sb->u.generic_sbp; +} static inline void hfs_nameout(struct inode *dir, struct hfs_name *out, const char *in, int len) { |