merge b_devel into HEAD (20030703)

[fs/lustre-release.git] / lustre / include / linux / obd_ext2.h

diff --git a/lustre/include/linux/obd_ext2.h b/lustre/include/linux/obd_ext2.h
index 6ab1b48..73b4b0b 100644 (file)
--- a/lustre/include/linux/obd_ext2.h
+++ b/lustre/include/linux/obd_ext2.h
@@ -9,17 +9,10 @@
 
 #define OBD_EXT2_RUNIT           _IOWR('f', 61, long)
 
-#include <linux/iobuf.h>
-
 #ifndef OBD_EXT2_DEVICENAME
 #define OBD_EXT2_DEVICENAME "obdext2"
 #endif
 
-struct ext2_obd {
-        struct super_block * ext2_sb;
-};
-
-
 /* development definitions */
 extern struct obdfs_sb_info *obd_sbi;
 extern struct file_operations *obd_fso;
@@ -27,7 +20,7 @@ extern struct file_operations *obd_fso;
 /* ext2_obd.c */
 extern struct obd_ops ext2_obd_ops;
 
-
+#include <linux/fs.h>
 #include <linux/ext2_fs.h>
 
 /* super.c */
@@ -49,7 +42,6 @@ extern struct super_operations ext2_sops;
 int obd_remount (struct super_block * sb, int * flags, char * data);
 struct super_block * ext2_read_super (struct super_block * sb, void * data,
                                       int silent);
-
 /* punch.c */
 void ext2_truncate (struct inode * inode);
 int ext2_punch (struct inode * inode, loff_t start, size_t count);