From: Andrew Morton Signed-off-by: Andrew Morton --- fs/reiser4/flush_queue.c | 2 +- fs/reiser4/fsdata.c | 6 +++--- fs/reiser4/jnode.c | 2 +- fs/reiser4/plugin/plugin_set.c | 2 +- fs/reiser4/super.h | 2 +- fs/reiser4/super_ops.c | 6 +++--- fs/reiser4/txnmgr.c | 6 +++--- fs/reiser4/znode.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff -puN fs/reiser4/jnode.c~reiser4-kmem_cache_t-removal fs/reiser4/jnode.c --- a/fs/reiser4/jnode.c~reiser4-kmem_cache_t-removal +++ a/fs/reiser4/jnode.c @@ -123,7 +123,7 @@ #include /* for struct address_space */ #include /* for inode_lock */ -static kmem_cache_t *_jnode_slab = NULL; +static struct kmem_cache *_jnode_slab = NULL; static void jnode_set_type(jnode * node, jnode_type type); static int jdelete(jnode * node); diff -puN fs/reiser4/flush_queue.c~reiser4-kmem_cache_t-removal fs/reiser4/flush_queue.c --- a/fs/reiser4/flush_queue.c~reiser4-kmem_cache_t-removal +++ a/fs/reiser4/flush_queue.c @@ -107,7 +107,7 @@ static void init_fq(flush_queue_t * fq) } /* slab for flush queues */ -static kmem_cache_t *fq_slab; +static struct kmem_cache *fq_slab; /** * reiser4_init_fqs - create flush queue cache diff -puN fs/reiser4/super.h~reiser4-kmem_cache_t-removal fs/reiser4/super.h --- a/fs/reiser4/super.h~reiser4-kmem_cache_t-removal +++ a/fs/reiser4/super.h @@ -444,7 +444,7 @@ long oids_used(const struct super_block void print_fs_info(const char *prefix, const struct super_block *); #endif -extern void destroy_reiser4_cache(kmem_cache_t **); +extern void destroy_reiser4_cache(struct kmem_cache **); extern struct super_operations reiser4_super_operations; extern struct export_operations reiser4_export_operations; diff -puN fs/reiser4/txnmgr.c~reiser4-kmem_cache_t-removal fs/reiser4/txnmgr.c --- a/fs/reiser4/txnmgr.c~reiser4-kmem_cache_t-removal +++ a/fs/reiser4/txnmgr.c @@ -90,7 +90,7 @@ year old --- define all technical terms For actually implementing these out-of-system-call-scopped transcrashes, the reiser4_context has a "txn_handle *trans" pointer that may be set to an open transcrash. Currently there are no dynamically-allocated transcrashes, but there is a - "kmem_cache_t *_txnh_slab" created for that purpose in this file. + "struct kmem_cache *_txnh_slab" created for that purpose in this file. */ /* Extending the other system call interfaces for future transaction features: @@ -279,9 +279,9 @@ struct _txn_wait_links { /* FIXME: In theory, we should be using the slab cache init & destructor methods instead of, e.g., jnode_init, etc. */ -static kmem_cache_t *_atom_slab = NULL; +static struct kmem_cache *_atom_slab = NULL; /* this is for user-visible, cross system-call transactions. */ -static kmem_cache_t *_txnh_slab = NULL; +static struct kmem_cache *_txnh_slab = NULL; /** * init_txnmgr_static - create transaction manager slab caches diff -puN fs/reiser4/super_ops.c~reiser4-kmem_cache_t-removal fs/reiser4/super_ops.c --- a/fs/reiser4/super_ops.c~reiser4-kmem_cache_t-removal +++ a/fs/reiser4/super_ops.c @@ -14,7 +14,7 @@ #include /* slab cache for inodes */ -static kmem_cache_t *inode_cache; +static struct kmem_cache *inode_cache; static struct dentry *reiser4_debugfs_root = NULL; @@ -27,7 +27,7 @@ static struct dentry *reiser4_debugfs_ro * Initialization function to be called when new page is allocated by reiser4 * inode cache. It is set on inode cache creation. */ -static void init_once(void *obj, kmem_cache_t *cache, unsigned long flags) +static void init_once(void *obj, struct kmem_cache *cache, unsigned long flags) { reiser4_inode_object *info; @@ -595,7 +595,7 @@ static struct file_system_type reiser4_f .next = NULL }; -void destroy_reiser4_cache(kmem_cache_t **cachep) +void destroy_reiser4_cache(struct kmem_cache **cachep) { BUG_ON(*cachep == NULL); kmem_cache_destroy(*cachep); diff -puN fs/reiser4/znode.c~reiser4-kmem_cache_t-removal fs/reiser4/znode.c --- a/fs/reiser4/znode.c~reiser4-kmem_cache_t-removal +++ a/fs/reiser4/znode.c @@ -196,7 +196,7 @@ TYPE_SAFE_HASH_DEFINE(z, znode, reiser4_ #undef KMALLOC /* slab for znodes */ -static kmem_cache_t *znode_cache; +static struct kmem_cache *znode_cache; int znode_shift_order; diff -puN fs/reiser4/plugin/plugin_set.c~reiser4-kmem_cache_t-removal fs/reiser4/plugin/plugin_set.c --- a/fs/reiser4/plugin/plugin_set.c~reiser4-kmem_cache_t-removal +++ a/fs/reiser4/plugin/plugin_set.c @@ -31,7 +31,7 @@ #include /* slab for plugin sets */ -static kmem_cache_t *plugin_set_slab; +static struct kmem_cache *plugin_set_slab; static spinlock_t plugin_set_lock[8] __cacheline_aligned_in_smp = { [0 ... 7] = SPIN_LOCK_UNLOCKED diff -puN fs/reiser4/fsdata.c~reiser4-kmem_cache_t-removal fs/reiser4/fsdata.c --- a/fs/reiser4/fsdata.c~reiser4-kmem_cache_t-removal +++ a/fs/reiser4/fsdata.c @@ -6,7 +6,7 @@ /* cache or dir_cursors */ -static kmem_cache_t *d_cursor_cache; +static struct kmem_cache *d_cursor_cache; static struct shrinker *d_cursor_shrinker; /* list of unused cursors */ @@ -595,7 +595,7 @@ void reiser4_detach_fsdata(struct file * } /* slab for reiser4_dentry_fsdata */ -static kmem_cache_t *dentry_fsdata_cache; +static struct kmem_cache *dentry_fsdata_cache; /** * reiser4_init_dentry_fsdata - create cache of dentry_fsdata @@ -662,7 +662,7 @@ void reiser4_free_dentry_fsdata(struct d } /* slab for reiser4_file_fsdata */ -static kmem_cache_t *file_fsdata_cache; +static struct kmem_cache *file_fsdata_cache; /** * reiser4_init_file_fsdata - create cache of reiser4_file_fsdata _