shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: drop null test before destroy functions

Browse Source 
Remove unneeded NULL test.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x;
@@

-if (x != NULL)
  \(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);

@@
expression x;
@@

-if (x != NULL) {
  \(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
  x = NULL;
-}
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Julia Lawall
2015-09-13 14:15:06 +02:00
committed by Greg Kroah-Hartman
parent 910b551c85
commit ce85ed4d15
3 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/lustre/lustre/llite/super25.c
View File

@@ -183,18 +183,10 @@ out_sysfs:
out_debugfs:
debugfs_remove(llite_root);
out_cache:
if (ll_inode_cachep != NULL)
kmem_cache_destroy(ll_inode_cachep);
if (ll_file_data_slab != NULL)
kmem_cache_destroy(ll_file_data_slab);
if (ll_remote_perm_cachep != NULL)
kmem_cache_destroy(ll_remote_perm_cachep);
if (ll_rmtperm_hash_cachep != NULL)
kmem_cache_destroy(ll_rmtperm_hash_cachep);
kmem_cache_destroy(ll_inode_cachep);
kmem_cache_destroy(ll_file_data_slab);
kmem_cache_destroy(ll_remote_perm_cachep);
kmem_cache_destroy(ll_rmtperm_hash_cachep);
return rc;
}

24
drivers/staging/lustre/lustre/obdclass/genops.c
View File

@@ -639,22 +639,14 @@ EXPORT_SYMBOL(class_notify_sptlrpc_conf);
void obd_cleanup_caches(void)
{
if (obd_device_cachep) {
kmem_cache_destroy(obd_device_cachep);
obd_device_cachep = NULL;
}
if (obdo_cachep) {
kmem_cache_destroy(obdo_cachep);
obdo_cachep = NULL;
}
if (import_cachep) {
kmem_cache_destroy(import_cachep);
import_cachep = NULL;
}
if (capa_cachep) {
kmem_cache_destroy(capa_cachep);
capa_cachep = NULL;
}
kmem_cache_destroy(obd_device_cachep);
obd_device_cachep = NULL;
kmem_cache_destroy(obdo_cachep);
obdo_cachep = NULL;
kmem_cache_destroy(import_cachep);
import_cachep = NULL;
kmem_cache_destroy(capa_cachep);
capa_cachep = NULL;
}
int obd_init_caches(void)

6
drivers/staging/lustre/lustre/obdclass/lu_object.c
View File

@@ -2052,10 +2052,8 @@ EXPORT_SYMBOL(lu_kmem_init);
void lu_kmem_fini(struct lu_kmem_descr *caches)
{
for (; caches->ckd_cache != NULL; ++caches) {
if (*caches->ckd_cache != NULL) {
kmem_cache_destroy(*caches->ckd_cache);
*caches->ckd_cache = NULL;
}
kmem_cache_destroy(*caches->ckd_cache);
*caches->ckd_cache = NULL;
}
}
EXPORT_SYMBOL(lu_kmem_fini);