From mboxrd@z Thu Jan 1 00:00:00 1970 Date: Tue, 21 Nov 2006 11:56:33 -0800 (PST) From: Christoph Lameter Subject: Re: [RFC 1/7] Remove declaration of sighand_cachep from slab.h In-Reply-To: <20061121114901.54a36e4b.akpm@osdl.org> Message-ID: References: <20061118054342.8884.12804.sendpatchset@schroedinger.engr.sgi.com> <20061118054347.8884.36259.sendpatchset@schroedinger.engr.sgi.com> <20061118172739.30538d16.sfr@canb.auug.org.au> <20061121000743.bb9ea2d0.akpm@osdl.org> <20061121114901.54a36e4b.akpm@osdl.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-linux-mm@kvack.org Return-Path: To: Andrew Morton Cc: Stephen Rothwell , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pekka Enberg , Manfred Spraul List-ID: On Tue, 21 Nov 2006, Andrew Morton wrote: > spose so, although I wouldn't bother about the typedef->#define change. > We just keep on plugging away at it until one day we can just remove the typedef. You do have script that can replace a string throughout the kernel right? A patch is following that does the core things in mm and include/linux/slab.h. Would you accept that patch and then do s/kmem_cache_t/struct kmem_cache/g over all the kernel sources? There would be some oversized lines but otherwise this should work. Remove kmem_cache_t Remove kmem_cache_t from mm. Signed-off-by: Christoph Lameter Index: linux-2.6.19-rc5-mm2/include/linux/slab.h =================================================================== --- linux-2.6.19-rc5-mm2.orig/include/linux/slab.h 2006-11-17 23:19:18.000000000 -0600 +++ linux-2.6.19-rc5-mm2/include/linux/slab.h 2006-11-21 13:53:51.679727359 -0600 @@ -9,8 +9,6 @@ #if defined(__KERNEL__) -typedef struct kmem_cache kmem_cache_t; - #include #include #include @@ -57,23 +55,24 @@ typedef struct kmem_cache kmem_cache_t; /* prototypes */ extern void __init kmem_cache_init(void); -extern kmem_cache_t *kmem_cache_create(const char *, size_t, size_t, unsigned long, - void (*)(void *, kmem_cache_t *, unsigned long), - void (*)(void *, kmem_cache_t *, unsigned long)); -extern void kmem_cache_destroy(kmem_cache_t *); -extern int kmem_cache_shrink(kmem_cache_t *); -extern void *kmem_cache_alloc(kmem_cache_t *, gfp_t); +extern struct kmem_cache *kmem_cache_create(const char *, + size_t, size_t, unsigned long, + void (*)(void *, struct kmem_cache *, unsigned long), + void (*)(void *, struct kmem_cache *, unsigned long)); +extern void kmem_cache_destroy(struct kmem_cache *); +extern int kmem_cache_shrink(struct kmem_cache *); +extern void *kmem_cache_alloc(struct kmem_cache *, gfp_t); extern void *kmem_cache_zalloc(struct kmem_cache *, gfp_t); -extern void kmem_cache_free(kmem_cache_t *, void *); -extern unsigned int kmem_cache_size(kmem_cache_t *); -extern const char *kmem_cache_name(kmem_cache_t *); +extern void kmem_cache_free(struct kmem_cache *, void *); +extern unsigned int kmem_cache_size(struct kmem_cache *); +extern const char *kmem_cache_name(struct kmem_cache *); /* Size description struct for general caches. */ struct cache_sizes { size_t cs_size; - kmem_cache_t *cs_cachep; + struct kmem_cache *cs_cachep; #ifdef CONFIG_ZONE_DMA - kmem_cache_t *cs_dmacachep; + struct kmem_cache *cs_dmacachep; #else #define cs_dmacachep cs_cachep #endif @@ -215,7 +214,7 @@ extern unsigned int ksize(const void *); extern int slab_is_available(void); #ifdef CONFIG_NUMA -extern void *kmem_cache_alloc_node(kmem_cache_t *, gfp_t flags, int node); +extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); extern void *__kmalloc_node(size_t size, gfp_t flags, int node); static inline void *kmalloc_node(size_t size, gfp_t flags, int node) @@ -241,7 +240,8 @@ found: return __kmalloc_node(size, flags, node); } #else -static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, gfp_t flags, int node) +static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep, + gfp_t flags, int node) { return kmem_cache_alloc(cachep, flags); } @@ -252,10 +252,11 @@ static inline void *kmalloc_node(size_t #endif extern int FASTCALL(kmem_cache_reap(int)); -extern int FASTCALL(kmem_ptr_validate(kmem_cache_t *cachep, void *ptr)); +extern int FASTCALL(kmem_ptr_validate(struct kmem_cache *cachep, void *ptr)); struct shrinker; -extern void kmem_set_shrinker(kmem_cache_t *cachep, struct shrinker *shrinker); +extern void kmem_set_shrinker(struct kmem_cache *cachep, + struct shrinker *shrinker); #else /* CONFIG_SLOB */ @@ -291,19 +292,19 @@ static inline void *kcalloc(size_t n, si #define kmalloc_track_caller kmalloc struct shrinker; -static inline void kmem_set_shrinker(kmem_cache_t *cachep, +static inline void kmem_set_shrinker(struct kmem_cache *cachep, struct shrinker *shrinker) {} #endif /* CONFIG_SLOB */ /* System wide caches */ -extern kmem_cache_t *vm_area_cachep; -extern kmem_cache_t *names_cachep; -extern kmem_cache_t *files_cachep; -extern kmem_cache_t *filp_cachep; -extern kmem_cache_t *fs_cachep; -extern kmem_cache_t *sighand_cachep; -extern kmem_cache_t *bio_cachep; +extern struct kmem_cache *vm_area_cachep; +extern struct kmem_cache *names_cachep; +extern struct kmem_cache *files_cachep; +extern struct kmem_cache *filp_cachep; +extern struct kmem_cache *fs_cachep; +extern struct kmem_cache *sighand_cachep; +extern struct kmem_cache *bio_cachep; #endif /* __KERNEL__ */ Index: linux-2.6.19-rc5-mm2/mm/slab.c =================================================================== --- linux-2.6.19-rc5-mm2.orig/mm/slab.c 2006-11-15 16:48:13.000000000 -0600 +++ linux-2.6.19-rc5-mm2/mm/slab.c 2006-11-21 13:21:50.009874395 -0600 @@ -4393,7 +4393,7 @@ unsigned int ksize(const void *objp) return obj_size(virt_to_cache(objp)); } -void kmem_set_shrinker(kmem_cache_t *cachep, struct shrinker *shrinker) +void kmem_set_shrinker(struct kmem_cache *cachep, struct shrinker *shrinker) { cachep->shrinker = shrinker; } Index: linux-2.6.19-rc5-mm2/mm/swap_prefetch.c =================================================================== --- linux-2.6.19-rc5-mm2.orig/mm/swap_prefetch.c 2006-11-15 16:48:13.000000000 -0600 +++ linux-2.6.19-rc5-mm2/mm/swap_prefetch.c 2006-11-21 13:22:56.496196955 -0600 @@ -39,7 +39,7 @@ struct swapped_root { struct radix_tree_root swap_tree; /* Lookup tree of pages */ unsigned int count; /* Number of entries */ unsigned int maxcount; /* Maximum entries allowed */ - kmem_cache_t *cache; /* Of struct swapped_entry */ + struct kmem_cache *cache; /* Of struct swapped_entry */ }; static struct swapped_root swapped = { -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org