Update <linux/malloc.h> to <linux/slab.h>.

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

diff --git a/lustre/include/linux/obd_raid1.h b/lustre/include/linux/obd_raid1.h
index cebe311..e28a708 100644 (file)
--- a/lustre/include/linux/obd_raid1.h
+++ b/lustre/include/linux/obd_raid1.h
@@ -5,14 +5,17 @@
 
 #define MAX_RAID1 16
 
+#ifndef OBD_RAID1_DEVICENAME
+#define OBD_RAID1_DEVICENAME "obdraid1"
+#endif
 
 struct raid1_obd {
-       unsigned int raid1_count; /* how many replicas */
-       /* devices to replicate on */
-       struct obd_device *raid1_devlist[MAX_RAID1];
-       /* connections we make */
-       struct obd_conn_info raid1_connections[MAX_RAID1];
-       struct list_head raid1_clients;  /* clients we have */
+        unsigned int raid1_count; /* how many replicas */
+        /* devices to replicate on */
+        struct obd_device *raid1_devlist[MAX_RAID1];
+        /* connections we make */
+        struct obd_conn_info raid1_connections[MAX_RAID1];
+        struct list_head raid1_clients;  /* clients we have */
 };
 
 
@@ -24,75 +27,4 @@ extern struct file_operations *obd_fso;
 extern struct obd_ops raid1_obd_ops;
 inline long ext2_block_map (struct inode * inode, long block);
 
-/* balloc.c */
-int ext2_new_block (const struct inode * inode, unsigned long goal,
-                   u32 * prealloc_count, u32 * prealloc_block, int * err);
-void ext2_free_blocks (const struct inode * inode, unsigned long block,
-                      unsigned long count);
-unsigned long ext2_count_free_blocks (struct super_block * sb);
-int ext2_group_sparse(int group);
-struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb,
-                                            unsigned int block_group,
-                                            struct buffer_head ** bh);
-
-/* bitmap.c */
-unsigned long ext2_count_free(struct buffer_head * map, unsigned int numchars);
-
-/* fsync.c */
-extern int obd_sync_file(struct file * file, struct dentry *dentry);
-
-/* ialloc.c */
-extern void ext2_free_inode (struct inode * inode);
-extern struct inode * ext2_new_inode (const struct inode * dir, int mode,
-                                    int * err);
-extern unsigned long ext2_count_free_inodes (struct super_block * sb);
-extern void ext2_check_inodes_bitmap (struct super_block * sb);
-extern int load_inode_bitmap (struct super_block * sb,
-                             unsigned int block_group);
-
-/* inode.c */
-void obd_read_inode (struct inode * inode);
-void obd_write_inode (struct inode * inode);
-void obd_put_inode (struct inode * inode);
-void obd_delete_inode (struct inode * inode);
-void obd_discard_prealloc_blocks (struct inode * inode);
-int obd_sync_inode (struct inode *inode);
-struct buffer_head * obd_bread (struct inode * inode, int block, 
-                                int create, int *err);
-struct buffer_head * obd_getblk (struct inode * inode, long block,
-                                 int create, int * err);
-
-
-/* super.c */
-#define ext2_warning obd_warning
-#undef ext2_error
-#define ext2_error obd_warning
-#define ext2_panic obd_warning
-#ifdef EXT2FS_DEBUG
-#  undef ext2_debug
-#  define ext2_debug(format, a...) CDEBUG(D_EXT2, format, ## a)
-#endif
-
-#define obd_error obd_warning
-#define obd_panic obd_warning
-#define obd_warning(sb, func, format, a...) CDEBUG(D_WARNING, format, ## a)
-
-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);
-
-/* truncate.c */
-void obd_truncate (struct inode * inode);
-
-/* operations */
-/* dir.c */
-extern struct inode_operations ext2_dir_inode_operations;
-
-/* file.c */
-extern struct file_operations ext2_file_operations;
-extern struct inode_operations ext2_file_inode_operations;
-
-/* super.c */
-extern struct super_operations ext2_sops;
-
 #endif