xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: Remove kmem_zone_destroy() wrapper

Browse Source 
Use kmem_cache_destroy directly

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Carlos Maiolino
2019-11-14 12:43:04 -08:00
committed by Darrick J. Wong
parent b1231760e4
commit aaf54eb8bc
4 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/kmem.h
View File

@@ -87,12 +87,6 @@ kmem_zone_free(kmem_zone_t *zone, void *ptr)
kmem_cache_free(zone, 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); extern void *kmem_zone_alloc(kmem_zone_t *, xfs_km_flags_t);
static inline void * static inline void *

2
fs/xfs/xfs_buf.c
View File

@@ -2075,7 +2075,7 @@ xfs_buf_init(void)
void void
xfs_buf_terminate(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) void xfs_buf_set_ref(struct xfs_buf *bp, int lru_ref)

6
fs/xfs/xfs_dquot.c
View File

@@ -1226,7 +1226,7 @@ xfs_qm_init(void)
return 0; return 0;
out_free_dqzone: out_free_dqzone:
kmem_zone_destroy(xfs_qm_dqzone); kmem_cache_destroy(xfs_qm_dqzone);
out: out:
return -ENOMEM; return -ENOMEM;
} }
@@ -1234,8 +1234,8 @@ out:
void void
xfs_qm_exit(void) xfs_qm_exit(void)
{ {
kmem_zone_destroy(xfs_qm_dqtrxzone); kmem_cache_destroy(xfs_qm_dqtrxzone);
kmem_zone_destroy(xfs_qm_dqzone); kmem_cache_destroy(xfs_qm_dqzone);
} }
/* /*

70
fs/xfs/xfs_super.c
View File

@@ -1921,39 +1921,39 @@ xfs_init_zones(void)
return 0; return 0;
out_destroy_bud_zone: out_destroy_bud_zone:
kmem_zone_destroy(xfs_bud_zone); kmem_cache_destroy(xfs_bud_zone);
out_destroy_cui_zone: out_destroy_cui_zone:
kmem_zone_destroy(xfs_cui_zone); kmem_cache_destroy(xfs_cui_zone);
out_destroy_cud_zone: out_destroy_cud_zone:
kmem_zone_destroy(xfs_cud_zone); kmem_cache_destroy(xfs_cud_zone);
out_destroy_rui_zone: out_destroy_rui_zone:
kmem_zone_destroy(xfs_rui_zone); kmem_cache_destroy(xfs_rui_zone);
out_destroy_rud_zone: out_destroy_rud_zone:
kmem_zone_destroy(xfs_rud_zone); kmem_cache_destroy(xfs_rud_zone);
out_destroy_icreate_zone: out_destroy_icreate_zone:
kmem_zone_destroy(xfs_icreate_zone); kmem_cache_destroy(xfs_icreate_zone);
out_destroy_ili_zone: out_destroy_ili_zone:
kmem_zone_destroy(xfs_ili_zone); kmem_cache_destroy(xfs_ili_zone);
out_destroy_inode_zone: out_destroy_inode_zone:
kmem_zone_destroy(xfs_inode_zone); kmem_cache_destroy(xfs_inode_zone);
out_destroy_efi_zone: out_destroy_efi_zone:
kmem_zone_destroy(xfs_efi_zone); kmem_cache_destroy(xfs_efi_zone);
out_destroy_efd_zone: out_destroy_efd_zone:
kmem_zone_destroy(xfs_efd_zone); kmem_cache_destroy(xfs_efd_zone);
out_destroy_buf_item_zone: out_destroy_buf_item_zone:
kmem_zone_destroy(xfs_buf_item_zone); kmem_cache_destroy(xfs_buf_item_zone);
out_destroy_trans_zone: out_destroy_trans_zone:
kmem_zone_destroy(xfs_trans_zone); kmem_cache_destroy(xfs_trans_zone);
out_destroy_ifork_zone: out_destroy_ifork_zone:
kmem_zone_destroy(xfs_ifork_zone); kmem_cache_destroy(xfs_ifork_zone);
out_destroy_da_state_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: 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: 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: out_destroy_log_ticket_zone:
kmem_zone_destroy(xfs_log_ticket_zone); kmem_cache_destroy(xfs_log_ticket_zone);
out: out:
return -ENOMEM; return -ENOMEM;
} }
@@ -1966,24 +1966,24 @@ xfs_destroy_zones(void)
* destroy caches. * destroy caches.
*/ */
rcu_barrier(); rcu_barrier();
kmem_zone_destroy(xfs_bui_zone); kmem_cache_destroy(xfs_bui_zone);
kmem_zone_destroy(xfs_bud_zone); kmem_cache_destroy(xfs_bud_zone);
kmem_zone_destroy(xfs_cui_zone); kmem_cache_destroy(xfs_cui_zone);
kmem_zone_destroy(xfs_cud_zone); kmem_cache_destroy(xfs_cud_zone);
kmem_zone_destroy(xfs_rui_zone); kmem_cache_destroy(xfs_rui_zone);
kmem_zone_destroy(xfs_rud_zone); kmem_cache_destroy(xfs_rud_zone);
kmem_zone_destroy(xfs_icreate_zone); kmem_cache_destroy(xfs_icreate_zone);
kmem_zone_destroy(xfs_ili_zone); kmem_cache_destroy(xfs_ili_zone);
kmem_zone_destroy(xfs_inode_zone); kmem_cache_destroy(xfs_inode_zone);
kmem_zone_destroy(xfs_efi_zone); kmem_cache_destroy(xfs_efi_zone);
kmem_zone_destroy(xfs_efd_zone); kmem_cache_destroy(xfs_efd_zone);
kmem_zone_destroy(xfs_buf_item_zone); kmem_cache_destroy(xfs_buf_item_zone);
kmem_zone_destroy(xfs_trans_zone); kmem_cache_destroy(xfs_trans_zone);
kmem_zone_destroy(xfs_ifork_zone); kmem_cache_destroy(xfs_ifork_zone);
kmem_zone_destroy(xfs_da_state_zone); kmem_cache_destroy(xfs_da_state_zone);
kmem_zone_destroy(xfs_btree_cur_zone); kmem_cache_destroy(xfs_btree_cur_zone);
kmem_zone_destroy(xfs_bmap_free_item_zone); kmem_cache_destroy(xfs_bmap_free_item_zone);
kmem_zone_destroy(xfs_log_ticket_zone); kmem_cache_destroy(xfs_log_ticket_zone);
} }
STATIC int __init STATIC int __init