diff -urpN linux-2.6.20-rc1/fs/squashfs/inode.c linux-2.6.20-rc1.new/fs/squashfs/inode.c --- linux-2.6.20-rc1/fs/squashfs/inode.c +++ linux-2.6.20-rc1.new/fs/squashfs/inode.c @@ -2098,13 +2098,13 @@ } -static kmem_cache_t * squashfs_inode_cachep; +static struct kmem_cache * squashfs_inode_cachep; static struct inode *squashfs_alloc_inode(struct super_block *sb) { struct squashfs_inode_info *ei; - ei = kmem_cache_alloc(squashfs_inode_cachep, SLAB_KERNEL); + ei = kmem_cache_alloc(squashfs_inode_cachep, GFP_KERNEL); if (!ei) return NULL; return &ei->vfs_inode; @@ -2117,7 +2117,7 @@ } -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 squashfs_inode_info *ei = foo;