summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDave Jones <davej@suse.de>2002-05-30 20:49:08 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-05-30 20:49:08 -0700
commit928098c9417f87f506407aad8c4730c85b98ea6c (patch)
treed61b1e8e39606a6d17e80df4b89819b4193e6c9d /include/linux
parent812c037463d0eff09f161acb6dbf720c7e74ec3e (diff)
[PATCH] struct super_block cleanup - adfs
Another one from Brian Gerst. Still applies to 2.5.18 Seperates adfs_sb_info from struct super_block.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/adfs_fs.h6
-rw-r--r--include/linux/fs.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/adfs_fs.h b/include/linux/adfs_fs.h
index 5c29f4982087..bebb2a0c5254 100644
--- a/include/linux/adfs_fs.h
+++ b/include/linux/adfs_fs.h
@@ -42,6 +42,7 @@ struct adfs_discrecord {
#ifdef __KERNEL__
#include <linux/adfs_fs_i.h>
+#include <linux/adfs_fs_sb.h>
/*
* Calculate the boot block checksum on an ADFS drive. Note that this will
* appear to be correct if the sector contains all zeros, so also check that
@@ -60,6 +61,11 @@ static inline int adfs_checkbblk(unsigned char *ptr)
return (result & 0xff) != ptr[511];
}
+static inline struct adfs_sb_info *ADFS_SB(struct super_block *sb)
+{
+ return sb->u.generic_sbp;
+}
+
static inline struct adfs_inode_info *ADFS_I(struct inode *inode)
{
return list_entry(inode, struct adfs_inode_info, vfs_inode);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7105142542c9..31a691491a9f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -625,7 +625,6 @@ extern void __kill_fasync(struct fasync_struct *, int, int);
#include <linux/hpfs_fs_sb.h>
#include <linux/ufs_fs_sb.h>
#include <linux/romfs_fs_sb.h>
-#include <linux/adfs_fs_sb.h>
extern struct list_head super_blocks;
extern spinlock_t sb_lock;
@@ -671,7 +670,6 @@ struct super_block {
struct hpfs_sb_info hpfs_sb;
struct ufs_sb_info ufs_sb;
struct romfs_sb_info romfs_sb;
- struct adfs_sb_info adfs_sb;
void *generic_sbp;
} u;
/*