Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / fs / minix / inode.c

diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index c11a4b9..629e09b 100644 (file)
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -51,12 +51,12 @@ static void minix_put_super(struct super_block *sb)
        return;
 }
 
-static kmem_cache_t * minix_inode_cachep;
+static struct kmem_cache * minix_inode_cachep;
 
 static struct inode *minix_alloc_inode(struct super_block *sb)
 {
        struct minix_inode_info *ei;
-       ei = (struct minix_inode_info *)kmem_cache_alloc(minix_inode_cachep, SLAB_KERNEL);
+       ei = (struct minix_inode_info *)kmem_cache_alloc(minix_inode_cachep, GFP_KERNEL);
        if (!ei)
                return NULL;
        return &ei->vfs_inode;
@@ -67,7 +67,7 @@ static void minix_destroy_inode(struct inode *inode)
        kmem_cache_free(minix_inode_cachep, minix_i(inode));
 }
 
-static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
 {
        struct minix_inode_info *ei = (struct minix_inode_info *) foo;
 
@@ -149,12 +149,8 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)
                return -ENOMEM;
        s->s_fs_info = sbi;
 
-       /* N.B. These should be compile-time tests.
-          Unfortunately that is impossible. */
-       if (32 != sizeof (struct minix_inode))
-               panic("bad V1 i-node size");
-       if (64 != sizeof(struct minix2_inode))
-               panic("bad V2 i-node size");
+       BUILD_BUG_ON(32 != sizeof (struct minix_inode));
+       BUILD_BUG_ON(64 != sizeof(struct minix2_inode));
 
        if (!sb_set_blocksize(s, BLOCK_SIZE))
                goto out_bad_hblock;