summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2002-03-17 15:38:00 +0000
committerDavid Woodhouse <dwmw2@infradead.org>2002-03-17 15:38:00 +0000
commit5bb3575c7c93e3315df4123a2911ada821e757c2 (patch)
tree3153d4eacba3cb97e5ef01084e38fa5d417f2323 /include
parent0b2e8f296ddf468918463779974ef88f5f9d42d7 (diff)
Remove jffs2_sb from struct super_block union.
Remove FS_REQUIRES_DEV from JFFS2. We never really used the block device anyway.
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h2
-rw-r--r--include/linux/jffs2_fs_sb.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index f9f89afcb51e..d05052fa4461 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -658,7 +658,6 @@ struct quota_mount_options
#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;
@@ -708,7 +707,6 @@ struct super_block {
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;
/*
diff --git a/include/linux/jffs2_fs_sb.h b/include/linux/jffs2_fs_sb.h
index c424eb13103c..129a4c31dee1 100644
--- a/include/linux/jffs2_fs_sb.h
+++ b/include/linux/jffs2_fs_sb.h
@@ -1,4 +1,4 @@
-/* $Id: jffs2_fs_sb.h,v 1.25 2002/03/08 15:11:24 dwmw2 Exp $ */
+/* $Id: jffs2_fs_sb.h,v 1.26 2002/03/17 10:18:42 dwmw2 Exp $ */
#ifndef _JFFS2_FS_SB
#define _JFFS2_FS_SB
@@ -81,6 +81,9 @@ struct jffs2_sb_info {
uint32_t wbuf_ofs;
uint32_t wbuf_len;
uint32_t wbuf_pagesize;
+
+ /* OS-private pointer for getting back to master superblock info */
+ void *os_priv;
};
#endif /* _JFFS2_FB_SB */