From f7d5152e59bb1565c457a4802b9c8348a407249c Mon Sep 17 00:00:00 2001
From: Brian Gerst <bgerst@didntduck.org>
Date: Tue, 12 Mar 2002 01:50:41 -0800
Subject: [PATCH] struct super_block cleanup - ext2

Complete the ext2 superblock seperation.
---
 include/linux/ext2_fs.h | 3 ++-
 include/linux/fs.h      | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'include/linux')

diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index 25c559767b91..527c8f0bf0db 100644
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -17,6 +17,7 @@
 #define _LINUX_EXT2_FS_H
 
 #include <linux/types.h>
+#include <linux/ext2_fs_sb.h>
 
 /*
  * The second extended filesystem constants/structures
@@ -73,7 +74,7 @@
 #ifdef __KERNEL__
 static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb)
 {
-	return &sb->u.ext2_sb;
+	return sb->u.generic_sbp;
 }
 #else
 /* Assume that user mode programs are passing in an ext2fs superblock, not
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 74ac6c530de3..09096196a424 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -648,7 +648,6 @@ struct quota_mount_options
 #define MNT_FORCE	0x00000001	/* Attempt to forcibily umount */
 #define MNT_DETACH	0x00000002	/* Just detach from the tree */
 
-#include <linux/ext2_fs_sb.h>
 #include <linux/ext3_fs_sb.h>
 #include <linux/hpfs_fs_sb.h>
 #include <linux/ntfs_fs_sb.h>
@@ -703,7 +702,6 @@ struct super_block {
 	char s_id[32];				/* Informational name */
 
 	union {
-		struct ext2_sb_info	ext2_sb;
 		struct ext3_sb_info	ext3_sb;
 		struct hpfs_sb_info	hpfs_sb;
 		struct ntfs_sb_info	ntfs_sb;
-- 
cgit v1.2.3