Commit 4ad858bd authored by Eric Suen's avatar Eric Suen Committed by Paul Moore
Browse files

selinux: replace kmem_cache_create() with KMEM_CACHE() 



Based on guidance in include/linux/slab.h, replace kmem_cache_create()
with KMEM_CACHE() for sources under security/selinux to simplify creation
of SLAB caches.

Signed-off-by: default avatarEric Suen <ericsu@linux.microsoft.com>
[PM: minor grammar nits in the description]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 2571bb9d

security/selinux/avc.c

+4 −12
Original line number Diff line number Diff line
@@ -134,18 +134,10 @@ static inline u32 avc_hash(u32 ssid, u32 tsid, u16 tclass) 
 */

void __init avc_init(void)

{

	avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node),

					0, SLAB_PANIC, NULL);

	avc_xperms_cachep = kmem_cache_create("avc_xperms_node",

					sizeof(struct avc_xperms_node),

					0, SLAB_PANIC, NULL);

	avc_xperms_decision_cachep = kmem_cache_create(

					"avc_xperms_decision_node",

					sizeof(struct avc_xperms_decision_node),

					0, SLAB_PANIC, NULL);

	avc_xperms_data_cachep = kmem_cache_create("avc_xperms_data",

					sizeof(struct extended_perms_data),

					0, SLAB_PANIC, NULL);

	avc_node_cachep = KMEM_CACHE(avc_node, SLAB_PANIC);

	avc_xperms_cachep = KMEM_CACHE(avc_xperms_node, SLAB_PANIC);

	avc_xperms_decision_cachep = KMEM_CACHE(avc_xperms_decision_node, SLAB_PANIC);

	avc_xperms_data_cachep = KMEM_CACHE(extended_perms_data, SLAB_PANIC);

}



int avc_get_hash_stats(char *page)

security/selinux/ss/avtab.c

+2 −5
Original line number Diff line number Diff line
@@ -604,9 +604,6 @@ int avtab_write(struct policydb *p, struct avtab *a, void *fp) 


void __init avtab_cache_init(void)

{

	avtab_node_cachep = kmem_cache_create(

		"avtab_node", sizeof(struct avtab_node), 0, SLAB_PANIC, NULL);

	avtab_xperms_cachep = kmem_cache_create(

		"avtab_extended_perms", sizeof(struct avtab_extended_perms), 0,

		SLAB_PANIC, NULL);

	avtab_node_cachep = KMEM_CACHE(avtab_node, SLAB_PANIC);

	avtab_xperms_cachep = KMEM_CACHE(avtab_extended_perms, SLAB_PANIC);

}

security/selinux/ss/ebitmap.c

+1 −3
Original line number Diff line number Diff line
@@ -572,7 +572,5 @@ u32 ebitmap_hash(const struct ebitmap *e, u32 hash) 


void __init ebitmap_cache_init(void)

{

	ebitmap_node_cachep = kmem_cache_create("ebitmap_node",

						sizeof(struct ebitmap_node), 0,

						SLAB_PANIC, NULL);

	ebitmap_node_cachep = KMEM_CACHE(ebitmap_node, SLAB_PANIC);

}

security/selinux/ss/hashtab.c

+1 −3
Original line number Diff line number Diff line
@@ -194,7 +194,5 @@ int hashtab_duplicate(struct hashtab *new, const struct hashtab *orig, 


void __init hashtab_cache_init(void)

{

	hashtab_node_cachep = kmem_cache_create("hashtab_node",

						sizeof(struct hashtab_node), 0,

						SLAB_PANIC, NULL);

	hashtab_node_cachep = KMEM_CACHE(hashtab_node, SLAB_PANIC);

}