Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

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

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 7c32187..36680d1 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -55,7 +55,7 @@ static int nfs_update_inode(struct inode *, struct nfs_fattr *);
 
 static void nfs_zap_acl_cache(struct inode *);
 
 
 static void nfs_zap_acl_cache(struct inode *);
 

-static kmem_cache_t * nfs_inode_cachep;
+static struct kmem_cache * nfs_inode_cachep;

 
 static inline unsigned long
 nfs_fattr_to_ino_t(struct nfs_fattr *fattr)
 
 static inline unsigned long
 nfs_fattr_to_ino_t(struct nfs_fattr *fattr)


@@ -1080,7 +1080,7 @@ void nfs4_clear_inode(struct inode *inode)
 struct inode *nfs_alloc_inode(struct super_block *sb)
 {
        struct nfs_inode *nfsi;
 struct inode *nfs_alloc_inode(struct super_block *sb)
 {
        struct nfs_inode *nfsi;

-       nfsi = (struct nfs_inode *)kmem_cache_alloc(nfs_inode_cachep, SLAB_KERNEL);
+       nfsi = (struct nfs_inode *)kmem_cache_alloc(nfs_inode_cachep, GFP_KERNEL);

        if (!nfsi)
                return NULL;
        nfsi->flags = 0UL;
        if (!nfsi)
                return NULL;
        nfsi->flags = 0UL;


@@ -1111,7 +1111,7 @@ static inline void nfs4_init_once(struct nfs_inode *nfsi)
 #endif
 }
 
 #endif
 }
 

-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 nfs_inode *nfsi = (struct nfs_inode *) foo;
 
 {
        struct nfs_inode *nfsi = (struct nfs_inode *) foo;