Commit aaf54eb8 authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Darrick J. Wong
Browse files

xfs: Remove kmem_zone_destroy() wrapper 



Use kmem_cache_destroy directly

Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent b1231760

fs/xfs/kmem.h

+0 −6
Original line number Diff line number Diff line
@@ -87,12 +87,6 @@ kmem_zone_free(kmem_zone_t *zone, void *ptr) 
	kmem_cache_free(zone, ptr);

}



static inline void

kmem_zone_destroy(kmem_zone_t *zone)

{

	kmem_cache_destroy(zone);

}



extern void *kmem_zone_alloc(kmem_zone_t *, xfs_km_flags_t);



static inline void *

fs/xfs/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -2075,7 +2075,7 @@ xfs_buf_init(void) 
void

xfs_buf_terminate(void)

{

	kmem_zone_destroy(xfs_buf_zone);

	kmem_cache_destroy(xfs_buf_zone);

}



void xfs_buf_set_ref(struct xfs_buf *bp, int lru_ref)

fs/xfs/xfs_dquot.c

+3 −3
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ xfs_qm_init(void) 
	return 0;



out_free_dqzone:

	kmem_zone_destroy(xfs_qm_dqzone);

	kmem_cache_destroy(xfs_qm_dqzone);

out:

	return -ENOMEM;

}
@@ -1234,8 +1234,8 @@ xfs_qm_init(void) 
void

xfs_qm_exit(void)

{

	kmem_zone_destroy(xfs_qm_dqtrxzone);

	kmem_zone_destroy(xfs_qm_dqzone);

	kmem_cache_destroy(xfs_qm_dqtrxzone);

	kmem_cache_destroy(xfs_qm_dqzone);

}



/*

fs/xfs/xfs_super.c

+35 −35
Original line number Diff line number Diff line
@@ -1921,39 +1921,39 @@ xfs_init_zones(void) 
	return 0;



 out_destroy_bud_zone:

	kmem_zone_destroy(xfs_bud_zone);

	kmem_cache_destroy(xfs_bud_zone);

 out_destroy_cui_zone:

	kmem_zone_destroy(xfs_cui_zone);

	kmem_cache_destroy(xfs_cui_zone);

 out_destroy_cud_zone:

	kmem_zone_destroy(xfs_cud_zone);

	kmem_cache_destroy(xfs_cud_zone);

 out_destroy_rui_zone:

	kmem_zone_destroy(xfs_rui_zone);

	kmem_cache_destroy(xfs_rui_zone);

 out_destroy_rud_zone:

	kmem_zone_destroy(xfs_rud_zone);

	kmem_cache_destroy(xfs_rud_zone);

 out_destroy_icreate_zone:

	kmem_zone_destroy(xfs_icreate_zone);

	kmem_cache_destroy(xfs_icreate_zone);

 out_destroy_ili_zone:

	kmem_zone_destroy(xfs_ili_zone);

	kmem_cache_destroy(xfs_ili_zone);

 out_destroy_inode_zone:

	kmem_zone_destroy(xfs_inode_zone);

	kmem_cache_destroy(xfs_inode_zone);

 out_destroy_efi_zone:

	kmem_zone_destroy(xfs_efi_zone);

	kmem_cache_destroy(xfs_efi_zone);

 out_destroy_efd_zone:

	kmem_zone_destroy(xfs_efd_zone);

	kmem_cache_destroy(xfs_efd_zone);

 out_destroy_buf_item_zone:

	kmem_zone_destroy(xfs_buf_item_zone);

	kmem_cache_destroy(xfs_buf_item_zone);

 out_destroy_trans_zone:

	kmem_zone_destroy(xfs_trans_zone);

	kmem_cache_destroy(xfs_trans_zone);

 out_destroy_ifork_zone:

	kmem_zone_destroy(xfs_ifork_zone);

	kmem_cache_destroy(xfs_ifork_zone);

 out_destroy_da_state_zone:

	kmem_zone_destroy(xfs_da_state_zone);

	kmem_cache_destroy(xfs_da_state_zone);

 out_destroy_btree_cur_zone:

	kmem_zone_destroy(xfs_btree_cur_zone);

	kmem_cache_destroy(xfs_btree_cur_zone);

 out_destroy_bmap_free_item_zone:

	kmem_zone_destroy(xfs_bmap_free_item_zone);

	kmem_cache_destroy(xfs_bmap_free_item_zone);

 out_destroy_log_ticket_zone:

	kmem_zone_destroy(xfs_log_ticket_zone);

	kmem_cache_destroy(xfs_log_ticket_zone);

 out:

	return -ENOMEM;

}
@@ -1966,24 +1966,24 @@ xfs_destroy_zones(void) 
	 * destroy caches.

	 */

	rcu_barrier();

	kmem_zone_destroy(xfs_bui_zone);

	kmem_zone_destroy(xfs_bud_zone);

	kmem_zone_destroy(xfs_cui_zone);

	kmem_zone_destroy(xfs_cud_zone);

	kmem_zone_destroy(xfs_rui_zone);

	kmem_zone_destroy(xfs_rud_zone);

	kmem_zone_destroy(xfs_icreate_zone);

	kmem_zone_destroy(xfs_ili_zone);

	kmem_zone_destroy(xfs_inode_zone);

	kmem_zone_destroy(xfs_efi_zone);

	kmem_zone_destroy(xfs_efd_zone);

	kmem_zone_destroy(xfs_buf_item_zone);

	kmem_zone_destroy(xfs_trans_zone);

	kmem_zone_destroy(xfs_ifork_zone);

	kmem_zone_destroy(xfs_da_state_zone);

	kmem_zone_destroy(xfs_btree_cur_zone);

	kmem_zone_destroy(xfs_bmap_free_item_zone);

	kmem_zone_destroy(xfs_log_ticket_zone);

	kmem_cache_destroy(xfs_bui_zone);

	kmem_cache_destroy(xfs_bud_zone);

	kmem_cache_destroy(xfs_cui_zone);

	kmem_cache_destroy(xfs_cud_zone);

	kmem_cache_destroy(xfs_rui_zone);

	kmem_cache_destroy(xfs_rud_zone);

	kmem_cache_destroy(xfs_icreate_zone);

	kmem_cache_destroy(xfs_ili_zone);

	kmem_cache_destroy(xfs_inode_zone);

	kmem_cache_destroy(xfs_efi_zone);

	kmem_cache_destroy(xfs_efd_zone);

	kmem_cache_destroy(xfs_buf_item_zone);

	kmem_cache_destroy(xfs_trans_zone);

	kmem_cache_destroy(xfs_ifork_zone);

	kmem_cache_destroy(xfs_da_state_zone);

	kmem_cache_destroy(xfs_btree_cur_zone);

	kmem_cache_destroy(xfs_bmap_free_item_zone);

	kmem_cache_destroy(xfs_log_ticket_zone);

}



STATIC int __init