[PATCH] struct super_block cleanup - final

This last patch removes the union, replacing it with s_fs_info.

17 files changed, 18 insertions, 19 deletions

diff --git a/include/linux/adfs_fs.h b/include/linux/adfs_fs.h
index 8241dab73109..9b49e9fcfb7c 100644
--- a/include/linux/adfs_fs.h
+++ b/include/linux/adfs_fs.h
@@ -63,7 +63,7 @@ static inline int adfs_checkbblk(unsigned char *ptr)
 
 static inline struct adfs_sb_info *ADFS_SB(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 static inline struct adfs_inode_info *ADFS_I(struct inode *inode)
diff --git a/include/linux/affs_fs_sb.h b/include/linux/affs_fs_sb.h
index 1f39cd806800..d2f86715cf1c 100644
--- a/include/linux/affs_fs_sb.h
+++ b/include/linux/affs_fs_sb.h
@@ -52,7 +52,7 @@ struct affs_sb_info {
 /* short cut to get to the affs specific sb data */
 static inline struct affs_sb_info *AFFS_SB(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 #endif
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index 1b562e74fa0c..50a9d8aafba2 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -26,7 +26,7 @@ struct venus_comm {
 
 static inline struct coda_sb_info *coda_sbp(struct super_block *sb)
 {
-    return ((struct coda_sb_info *)((sb)->u.generic_sbp));
+    return ((struct coda_sb_info *)((sb)->s_fs_info));
 }
 
 
diff --git a/include/linux/cramfs_fs_sb.h b/include/linux/cramfs_fs_sb.h
index 92d72fca572f..8390693568fd 100644
--- a/include/linux/cramfs_fs_sb.h
+++ b/include/linux/cramfs_fs_sb.h
@@ -14,7 +14,7 @@ struct cramfs_sb_info {
 
 static inline struct cramfs_sb_info *CRAMFS_SB(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 #endif
diff --git a/include/linux/efs_fs.h b/include/linux/efs_fs.h
index 8121f57b4947..a636043ab8a3 100644
--- a/include/linux/efs_fs.h
+++ b/include/linux/efs_fs.h
@@ -46,7 +46,7 @@ static inline struct efs_inode_info *INODE_INFO(struct inode *inode)
 
 static inline struct efs_sb_info *SUPER_INFO(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 extern struct inode_operations efs_dir_inode_operations;
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index e84468874422..c50ffd7ebc58 100644
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -74,7 +74,7 @@
 #ifdef __KERNEL__
 static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 #else
 /* Assume that user mode programs are passing in an ext2fs superblock, not
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index b4463b65ba37..ddabc22881f4 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -455,7 +455,7 @@ struct ext3_super_block {
 #ifdef __KERNEL__
 static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 static inline struct ext3_inode_info *EXT3_I(struct inode *inode)
 {
diff --git a/include/linux/fs.h b/include/linux/fs.h
index cf33351023cf..fa03013be9d2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -667,9 +667,8 @@ struct super_block {
 
 	char s_id[32];				/* Informational name */
 
-	union {
-		void			*generic_sbp;
-	} u;
+	void 			*s_fs_info;	/* Filesystem private info */
+
 	/*
 	 * The next field is for VFS *only*. No filesystems have any business
 	 * even looking at it. You had been warned.
diff --git a/include/linux/hfs_fs.h b/include/linux/hfs_fs.h
index 308d27b2017a..40971822e3e4 100644
--- a/include/linux/hfs_fs.h
+++ b/include/linux/hfs_fs.h
@@ -327,7 +327,7 @@ static inline struct hfs_inode_info *HFS_I(struct inode *inode)
 
 static inline struct hfs_sb_info *HFS_SB(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 static inline void hfs_nameout(struct inode *dir, struct hfs_name *out,
diff --git a/include/linux/iso_fs.h b/include/linux/iso_fs.h
index 17e9d20b7edb..0ac0aa2334ea 100644
--- a/include/linux/iso_fs.h
+++ b/include/linux/iso_fs.h
@@ -174,7 +174,7 @@ struct iso_directory_record {
 
 static inline struct isofs_sb_info *ISOFS_SB(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 static inline struct iso_inode_info *ISOFS_I(struct inode *inode)
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
index 2ca3a3abce00..e0279aa72429 100644
--- a/include/linux/msdos_fs.h
+++ b/include/linux/msdos_fs.h
@@ -193,7 +193,7 @@ struct vfat_slot_info {
 
 static inline struct msdos_sb_info *MSDOS_SB(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 static inline struct msdos_inode_info *MSDOS_I(struct inode *inode)
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h
index 4a060ff0c868..a15a7ac2f6a3 100644
--- a/include/linux/ncp_fs.h
+++ b/include/linux/ncp_fs.h
@@ -192,7 +192,7 @@ struct ncp_entry_info {
 
 static inline struct ncp_server *NCP_SBP(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 #define NCP_SERVER(inode)	NCP_SBP((inode)->i_sb)
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 582c7aa90344..42f716fd142f 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -192,7 +192,7 @@ static inline struct nfs_inode *NFS_I(struct inode *inode)
 {
 	return container_of(inode, struct nfs_inode, vfs_inode);
 }
-#define NFS_SB(s)		((struct nfs_server *)(s->u.generic_sbp))
+#define NFS_SB(s)		((struct nfs_server *)(s->s_fs_info))
 
 #define NFS_FH(inode)			(&NFS_I(inode)->fh)
 #define NFS_SERVER(inode)		(NFS_SB(inode->i_sb))
diff --git a/include/linux/qnx4_fs.h b/include/linux/qnx4_fs.h
index 14a8c6ff743c..5710620989d5 100644
--- a/include/linux/qnx4_fs.h
+++ b/include/linux/qnx4_fs.h
@@ -135,7 +135,7 @@ extern int qnx4_get_block(struct inode *inode, sector_t iblock, struct buffer_he
 
 static inline struct qnx4_sb_info *qnx4_sb(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 static inline struct qnx4_inode_info *qnx4_i(struct inode *inode)
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index ee20abf5bb6c..6f1a3d936535 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -294,7 +294,7 @@ static inline struct reiserfs_inode_info *REISERFS_I(struct inode *inode)
 
 static inline struct reiserfs_sb_info *REISERFS_SB(const struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 /** this says about version of key of all items (but stat data) the
diff --git a/include/linux/smb_fs.h b/include/linux/smb_fs.h
index 41f9cd84c0b9..7ba56f8996f5 100644
--- a/include/linux/smb_fs.h
+++ b/include/linux/smb_fs.h
@@ -33,7 +33,7 @@
 
 static inline struct smb_sb_info *SMB_SB(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 static inline struct smb_inode_info *SMB_I(struct inode *inode)
diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h
index dd9bc72d795e..cc3ddd5f680f 100644
--- a/include/linux/ufs_fs.h
+++ b/include/linux/ufs_fs.h
@@ -785,7 +785,7 @@ extern void ufs_truncate (struct inode *);
 
 static inline struct ufs_sb_info *UFS_SB(struct super_block *sb)
 {
-	return sb->u.generic_sbp;
+	return sb->s_fs_info;
 }
 
 static inline struct ufs_inode_info *UFS_I(struct inode *inode)