Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / fs / efs / super.c

diff --git a/fs/efs/super.c b/fs/efs/super.c
index af4d01e..dff623e 100644 (file)
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -32,6 +32,26 @@ static struct file_system_type efs_fs_type = {
        .fs_flags       = FS_REQUIRES_DEV,
 };
 
+static struct pt_types sgi_pt_types[] = {
+       {0x00,          "SGI vh"},
+       {0x01,          "SGI trkrepl"},
+       {0x02,          "SGI secrepl"},
+       {0x03,          "SGI raw"},
+       {0x04,          "SGI bsd"},
+       {SGI_SYSV,      "SGI sysv"},
+       {0x06,          "SGI vol"},
+       {SGI_EFS,       "SGI efs"},
+       {0x08,          "SGI lv"},
+       {0x09,          "SGI rlv"},
+       {0x0A,          "SGI xfs"},
+       {0x0B,          "SGI xfslog"},
+       {0x0C,          "SGI xlv"},
+       {0x82,          "Linux swap"},
+       {0x83,          "Linux native"},
+       {0,             NULL}
+};
+
+
 static kmem_cache_t * efs_inode_cachep;
 
 static struct inode *efs_alloc_inode(struct super_block *sb)
@@ -61,7 +81,7 @@ static int init_inodecache(void)
 {
        efs_inode_cachep = kmem_cache_create("efs_inode_cache",
                                sizeof(struct efs_inode_info),
-                               0, SLAB_RECLAIM_ACCOUNT,
+                               0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
                                init_once, NULL);
        if (efs_inode_cachep == NULL)
                return -ENOMEM;
@@ -202,12 +222,13 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
                        sblock);
 #endif
        }
-       return(sblock);
+       return sblock;
 }
 
 static int efs_validate_super(struct efs_sb_info *sb, struct efs_super *super) {
 
-       if (!IS_EFS_MAGIC(be32_to_cpu(super->fs_magic))) return -1;
+       if (!IS_EFS_MAGIC(be32_to_cpu(super->fs_magic)))
+               return -1;
 
        sb->fs_magic     = be32_to_cpu(super->fs_magic);
        sb->total_blocks = be32_to_cpu(super->fs_size);