summaryrefslogtreecommitdiff
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cam.ac.uk>2002-03-18 23:29:13 +0000
committerAnton Altaparmakov <aia21@drop.stormcorp.org>2002-03-18 23:29:13 +0000
commitc1a6eca6a59514fd735f428abe416e8ea4b91aa2 (patch)
tree35c1cbff6ac0904035385c0fca62b4332bf0f9fc /include/linux/fs.h
parent3cc589c414b4e08b6f967d41cbd4e65df14ef5e3 (diff)
parent085c9a18acd4003fa77cf852aa770e52b2ce6a71 (diff)
Merge cam.ac.uk:/usr/src/bklinux-2.5
into cam.ac.uk:/usr/src/bkntfs-tng-2.5
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index dc0d9a84bf27..375d53dd69e9 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -471,7 +471,6 @@ static inline struct inode *SOCK_INODE(struct socket *socket)
return &list_entry(socket, struct socket_alloc, socket)->vfs_inode;
}
-#include <linux/shmem_fs.h>
/* will die */
#include <linux/coda_fs_i.h>
#include <linux/ext3_fs_i.h>
@@ -647,17 +646,12 @@ struct quota_mount_options
#include <linux/ext3_fs_sb.h>
#include <linux/hpfs_fs_sb.h>
-#include <linux/iso_fs_sb.h>
#include <linux/sysv_fs_sb.h>
-#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>
-#include <linux/udf_fs_sb.h>
-#include <linux/jffs2_fs_sb.h>
extern struct list_head super_blocks;
extern spinlock_t sb_lock;
@@ -695,18 +689,12 @@ struct super_block {
union {
struct ext3_sb_info ext3_sb;
struct hpfs_sb_info hpfs_sb;
- struct isofs_sb_info isofs_sb;
struct sysv_sb_info sysv_sb;
- struct affs_sb_info affs_sb;
struct ufs_sb_info ufs_sb;
- struct shmem_sb_info shmem_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;
- struct udf_sb_info udf_sb;
- struct jffs2_sb_info jffs2_sb;
void *generic_sbp;
} u;
/*