summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDave Jones <davej@suse.de>2002-08-19 18:10:54 -0700
committerDave Jones <davej@suse.de>2002-08-19 18:10:54 -0700
commit136b6223bfb668b502f6ef20e0106d27dbf9495c (patch)
tree79bf5e4f85d89410dab59b69a86369b1289f2cbd /include
parent6424ea03c9ac36098e59c89264494ee69818ed5c (diff)
[PATCH] UFS superblock cleanup.
This one from Brian Gerst seperates UFS from the struct superblock union.
Diffstat (limited to 'include')
-rw-r--r--include/linux/ufs_fs.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h
index 7ba4e3e66e4e..dd9bc72d795e 100644
--- a/include/linux/ufs_fs.h
+++ b/include/linux/ufs_fs.h
@@ -33,6 +33,9 @@
#include <linux/stat.h>
#include <linux/fs.h>
+#include <linux/ufs_fs_i.h>
+#include <linux/ufs_fs_sb.h>
+
#define UFS_BBLOCK 0
#define UFS_BBSIZE 8192
#define UFS_SBLOCK 8192
@@ -398,7 +401,7 @@ struct ufs_super_block {
* Convert cylinder group to base address of its global summary info.
*/
#define fs_cs(indx) \
- u.ufs_sb.s_csp[(indx) >> uspi->s_csshift][(indx) & ~uspi->s_csmask]
+ s_csp[(indx) >> uspi->s_csshift][(indx) & ~uspi->s_csmask]
/*
* Cylinder group block for a file system.
@@ -780,7 +783,10 @@ extern struct inode_operations ufs_fast_symlink_inode_operations;
/* truncate.c */
extern void ufs_truncate (struct inode *);
-#include <linux/ufs_fs_i.h>
+static inline struct ufs_sb_info *UFS_SB(struct super_block *sb)
+{
+ return sb->u.generic_sbp;
+}
static inline struct ufs_inode_info *UFS_I(struct inode *inode)
{