Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2109a2d1 authored by Pekka J Enberg's avatar Pekka J Enberg Committed by Linus Torvalds
Browse files

[PATCH] mm: rename kmem_cache_s to kmem_cache 



This patch renames struct kmem_cache_s to kmem_cache so we can start using
it instead of kmem_cache_t typedef.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4f12bb4f

Documentation/magic-number.txt

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ ISDN_NET_MAGIC 0x49344C02 isdn_net_local_s drivers/isdn/i4l/isdn_net_li 
SAVEKMSG_MAGIC2       0x4B4D5347  savekmsg          arch/*/amiga/config.c

STLI_BOARDMAGIC       0x4bc6c825  stlibrd           include/linux/istallion.h

CS_STATE_MAGIC        0x4c4f4749  cs_state          sound/oss/cs46xx.c

SLAB_C_MAGIC          0x4f17a36d  kmem_cache_s      mm/slab.c

SLAB_C_MAGIC          0x4f17a36d  kmem_cache        mm/slab.c

COW_MAGIC             0x4f4f4f4d  cow_header_v1     arch/um/drivers/ubd_user.c

I810_CARD_MAGIC       0x5072696E  i810_card         sound/oss/i810_audio.c

TRIDENT_CARD_MAGIC    0x5072696E  trident_card      sound/oss/trident.c

fs/file_table.c

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static DEFINE_SPINLOCK(filp_count_lock); 
 * context and must be fully threaded - use a local spinlock

 * to protect files_stat.nr_files

 */

void filp_ctor(void * objp, struct kmem_cache_s *cachep, unsigned long cflags)

void filp_ctor(void *objp, struct kmem_cache *cachep, unsigned long cflags)

{

	if ((cflags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==

	    SLAB_CTOR_CONSTRUCTOR) {
@@ -46,7 +46,7 @@ void filp_ctor(void * objp, struct kmem_cache_s *cachep, unsigned long cflags) 
	}

}



void filp_dtor(void * objp, struct kmem_cache_s *cachep, unsigned long dflags)

void filp_dtor(void *objp, struct kmem_cache *cachep, unsigned long dflags)

{

	unsigned long flags;

	spin_lock_irqsave(&filp_count_lock, flags);

fs/freevxfs/vxfs_extern.h

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
 */





struct kmem_cache_s;

struct kmem_cache;

struct super_block;

struct vxfs_inode_info;

struct inode;
@@ -51,7 +51,7 @@ extern daddr_t vxfs_bmap1(struct inode *, long); 
extern int			vxfs_read_fshead(struct super_block *);



/* vxfs_inode.c */

extern struct kmem_cache_s	*vxfs_inode_cachep;

extern struct kmem_cache	*vxfs_inode_cachep;

extern void			vxfs_dumpi(struct vxfs_inode_info *, ino_t);

extern struct inode *		vxfs_get_fake_inode(struct super_block *,

					struct vxfs_inode_info *);

fs/xfs/linux-2.6/kmem.h

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
#define KM_NOFS		0x0004u

#define KM_MAYFAIL	0x0008u



#define	kmem_zone	kmem_cache_s

#define kmem_zone_t	kmem_cache_t

#define	kmem_zone	kmem_cache

#define kmem_zone_t	struct kmem_cache



typedef unsigned long xfs_pflags_t;

include/linux/file.h

+3 −3
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ extern void FASTCALL(set_close_on_exec(unsigned int fd, int flag)); 
extern void put_filp(struct file *);

extern int get_unused_fd(void);

extern void FASTCALL(put_unused_fd(unsigned int fd));

struct kmem_cache_s;

extern void filp_ctor(void * objp, struct kmem_cache_s *cachep, unsigned long cflags);

extern void filp_dtor(void * objp, struct kmem_cache_s *cachep, unsigned long dflags);

struct kmem_cache;

extern void filp_ctor(void * objp, struct kmem_cache *cachep, unsigned long cflags);

extern void filp_dtor(void * objp, struct kmem_cache *cachep, unsigned long dflags);



extern struct file ** alloc_fd_array(int);

extern void free_fd_array(struct file **, int);