diff options
| author | Brian Gerst <bgerst@didntduck.org> | 2002-03-14 23:16:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-03-14 23:16:08 -0800 |
| commit | c4da2aeaa7205f8787c06caa11a4af142567b333 (patch) | |
| tree | b0e5d75339a4be0612b0f94f0d10868343836c4a /include | |
| parent | 88774498ce0502af118d42b76ff93acdcb0a1579 (diff) | |
[PATCH] struct super_block cleanup - qnx4
Seperates qnx4_sb_info from struct super_block.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 2 | ||||
| -rw-r--r-- | include/linux/qnx4_fs.h | 12 | ||||
| -rw-r--r-- | include/linux/qnx4_fs_sb.h | 27 |
3 files changed, 12 insertions, 29 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index effe19261c54..f9f89afcb51e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -655,7 +655,6 @@ struct quota_mount_options #include <linux/romfs_fs_sb.h> #include <linux/hfs_fs_sb.h> #include <linux/adfs_fs_sb.h> -#include <linux/qnx4_fs_sb.h> #include <linux/reiserfs_fs_sb.h> #include <linux/bfs_fs_sb.h> #include <linux/udf_fs_sb.h> @@ -706,7 +705,6 @@ struct super_block { struct romfs_sb_info romfs_sb; struct hfs_sb_info hfs_sb; struct adfs_sb_info adfs_sb; - struct qnx4_sb_info qnx4_sb; struct reiserfs_sb_info reiserfs_sb; struct bfs_sb_info bfs_sb; struct udf_sb_info udf_sb; diff --git a/include/linux/qnx4_fs.h b/include/linux/qnx4_fs.h index fc1912a3fd72..06e0e6b51e4c 100644 --- a/include/linux/qnx4_fs.h +++ b/include/linux/qnx4_fs.h @@ -97,6 +97,13 @@ struct qnx4_super_block { #define QNX4DEBUG(X) (void) 0 #endif +struct qnx4_sb_info { + struct buffer_head *sb_buf; /* superblock buffer */ + struct qnx4_super_block *sb; /* our superblock */ + unsigned int Version; /* may be useful */ + struct qnx4_inode_entry *BitMap; /* useful */ +}; + struct qnx4_inode_info { struct qnx4_inode_entry raw; unsigned long mmu_private; @@ -126,6 +133,11 @@ extern int qnx4_sync_file(struct file *file, struct dentry *dentry, int); extern int qnx4_sync_inode(struct inode *inode); extern int qnx4_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh, int create); +static inline struct qnx4_sb_info *qnx4_sb(struct super_block *sb) +{ + return sb->u.generic_sbp; +} + static inline struct qnx4_inode_info *qnx4_i(struct inode *inode) { return list_entry(inode, struct qnx4_inode_info, vfs_inode); diff --git a/include/linux/qnx4_fs_sb.h b/include/linux/qnx4_fs_sb.h deleted file mode 100644 index 1f62cc0cc7fb..000000000000 --- a/include/linux/qnx4_fs_sb.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Name : qnx4_fs_sb.h - * Author : Richard Frowijn - * Function : qnx4 superblock definitions - * Version : 1.0.2 - * Last modified : 2000-01-06 - * - * History : 23-03-1998 created - * - */ -#ifndef _QNX4_FS_SB -#define _QNX4_FS_SB - -#include <linux/qnx4_fs.h> - -/* - * qnx4 super-block data in memory - */ - -struct qnx4_sb_info { - struct buffer_head *sb_buf; /* superblock buffer */ - struct qnx4_super_block *sb; /* our superblock */ - unsigned int Version; /* may be useful */ - struct qnx4_inode_entry *BitMap; /* useful */ -}; - -#endif |