openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] Really ignore kmem_cache_destroy return value 

* Rougly half of callers already do it by not checking return value
* Code in drivers/acpi/osl.c does the following to be sure:

	(void)kmem_cache_destroy(cache);

* Those who check it printk something, however, slab_error already printed
  the name of failed cache.
* XFS BUGs on failed kmem_cache_destroy which is not the decision
  low-level filesystem driver should make. Converted to ignore.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alexey Dobriyan 2006-09-27 01:49:40 -07:00 committed by Linus Torvalds
parent f52720ca5f
commit 1a1d92c10d
40 changed files with 53 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/osl.c
View File

@ -1079,7 +1079,7 @@ acpi_status acpi_os_purge_cache(acpi_cache_t * cache)
acpi_status acpi_os_delete_cache(acpi_cache_t * cache)
{
(void)kmem_cache_destroy(cache);
kmem_cache_destroy(cache);
return (AE_OK);
}

5
drivers/infiniband/core/mad.c
View File

@ -2987,10 +2987,7 @@ static int __init ib_mad_init_module(void)
static void __exit ib_mad_cleanup_module(void)
{
ib_unregister_client(&mad_client);
if (kmem_cache_destroy(ib_mad_cache)) {
printk(KERN_DEBUG PFX "Failed to destroy ib_mad cache\n");
}
kmem_cache_destroy(ib_mad_cache);
}
module_init(ib_mad_init_module);

8
drivers/usb/host/uhci-hcd.c
View File

@ -913,8 +913,7 @@ static int __init uhci_hcd_init(void)
return 0;
init_failed:
if (kmem_cache_destroy(uhci_up_cachep))
warn("not all urb_privs were freed!");
kmem_cache_destroy(uhci_up_cachep);
up_failed:
debugfs_remove(uhci_debugfs_root);
@ -930,10 +929,7 @@ static int __init uhci_hcd_init(void)
static void __exit uhci_hcd_cleanup(void)
{
pci_unregister_driver(&uhci_pci_driver);
if (kmem_cache_destroy(uhci_up_cachep))
warn("not all urb_privs were freed!");
kmem_cache_destroy(uhci_up_cachep);
debugfs_remove(uhci_debugfs_root);
kfree(errbuf);
}

3
fs/adfs/super.c
View File

@ -251,8 +251,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(adfs_inode_cachep))
printk(KERN_INFO "adfs_inode_cache: not all structures were freed\n");
kmem_cache_destroy(adfs_inode_cachep);
}
static struct super_operations adfs_sops = {

3
fs/affs/super.c
View File

@ -109,8 +109,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(affs_inode_cachep))
printk(KERN_INFO "affs_inode_cache: not all structures were freed\n");
kmem_cache_destroy(affs_inode_cachep);
}
static struct super_operations affs_sops = {

4
fs/befs/linuxvfs.c
View File

@ -446,9 +446,7 @@ befs_init_inodecache(void)
static void
befs_destroy_inodecache(void)
{
if (kmem_cache_destroy(befs_inode_cachep))
printk(KERN_ERR "befs_destroy_inodecache: "
"not all structures were freed\n");
kmem_cache_destroy(befs_inode_cachep);
}
/*

3
fs/bfs/inode.c
View File

@ -268,8 +268,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(bfs_inode_cachep))
printk(KERN_INFO "bfs_inode_cache: not all structures were freed\n");
kmem_cache_destroy(bfs_inode_cachep);
}
static struct super_operations bfs_sops = {

20
fs/cifs/cifsfs.c
View File

@ -699,8 +699,7 @@ cifs_init_inodecache(void)
static void
cifs_destroy_inodecache(void)
{
if (kmem_cache_destroy(cifs_inode_cachep))
printk(KERN_WARNING "cifs_inode_cache: error freeing\n");
kmem_cache_destroy(cifs_inode_cachep);
}
static int
@ -778,13 +777,9 @@ static void
cifs_destroy_request_bufs(void)
{
mempool_destroy(cifs_req_poolp);
if (kmem_cache_destroy(cifs_req_cachep))
printk(KERN_WARNING
"cifs_destroy_request_cache: error not all structures were freed\n");
kmem_cache_destroy(cifs_req_cachep);
mempool_destroy(cifs_sm_req_poolp);
if (kmem_cache_destroy(cifs_sm_req_cachep))
printk(KERN_WARNING
"cifs_destroy_request_cache: cifs_small_rq free error\n");
kmem_cache_destroy(cifs_sm_req_cachep);
}
static int
@ -819,13 +814,8 @@ static void
cifs_destroy_mids(void)
{
mempool_destroy(cifs_mid_poolp);
if (kmem_cache_destroy(cifs_mid_cachep))
printk(KERN_WARNING
"cifs_destroy_mids: error not all structures were freed\n");
if (kmem_cache_destroy(cifs_oplock_cachep))
printk(KERN_WARNING
"error not all oplock structures were freed\n");
kmem_cache_destroy(cifs_mid_cachep);
kmem_cache_destroy(cifs_oplock_cachep);
}
static int cifs_oplock_thread(void * dummyarg)

3
fs/coda/inode.c
View File

@ -80,8 +80,7 @@ int coda_init_inodecache(void)
void coda_destroy_inodecache(void)
{
if (kmem_cache_destroy(coda_inode_cachep))
printk(KERN_INFO "coda_inode_cache: not all structures were freed\n");
kmem_cache_destroy(coda_inode_cachep);
}
static int coda_remount(struct super_block *sb, int *flags, char *data)

3
fs/efs/super.c
View File

@ -90,8 +90,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(efs_inode_cachep))
printk(KERN_INFO "efs_inode_cache: not all structures were freed\n");
kmem_cache_destroy(efs_inode_cachep);
}
static void efs_put_super(struct super_block *s)

3
fs/ext2/super.c
View File

@ -184,8 +184,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(ext2_inode_cachep))
printk(KERN_INFO "ext2_inode_cache: not all structures were freed\n");
kmem_cache_destroy(ext2_inode_cachep);
}
static void ext2_clear_inode(struct inode *inode)

3
fs/ext3/super.c
View File

@ -491,8 +491,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(ext3_inode_cachep))
printk(KERN_INFO "ext3_inode_cache: not all structures were freed\n");
kmem_cache_destroy(ext3_inode_cachep);
}
static void ext3_clear_inode(struct inode *inode)

3
fs/fat/cache.c
View File

@ -58,8 +58,7 @@ int __init fat_cache_init(void)
void fat_cache_destroy(void)
{
if (kmem_cache_destroy(fat_cache_cachep))
printk(KERN_INFO "fat_cache: not all structures were freed\n");
kmem_cache_destroy(fat_cache_cachep);
}
static inline struct fat_cache *fat_cache_alloc(struct inode *inode)

3
fs/fat/inode.c
View File

@ -528,8 +528,7 @@ static int __init fat_init_inodecache(void)
static void __exit fat_destroy_inodecache(void)
{
if (kmem_cache_destroy(fat_inode_cachep))
printk(KERN_INFO "fat_inode_cache: not all structures were freed\n");
kmem_cache_destroy(fat_inode_cachep);
}
static int fat_remount(struct super_block *sb, int *flags, char *data)

3
fs/hfs/super.c
View File

@ -454,8 +454,7 @@ static int __init init_hfs_fs(void)
static void __exit exit_hfs_fs(void)
{
unregister_filesystem(&hfs_fs_type);
if (kmem_cache_destroy(hfs_inode_cachep))
printk(KERN_ERR "hfs_inode_cache: not all structures were freed\n");
kmem_cache_destroy(hfs_inode_cachep);
}
module_init(init_hfs_fs)

3
fs/hfsplus/super.c
View File

@ -493,8 +493,7 @@ static int __init init_hfsplus_fs(void)
static void __exit exit_hfsplus_fs(void)
{
unregister_filesystem(&hfsplus_fs_type);
if (kmem_cache_destroy(hfsplus_inode_cachep))
printk(KERN_ERR "hfsplus_inode_cache: not all structures were freed\n");
kmem_cache_destroy(hfsplus_inode_cachep);
}
module_init(init_hfsplus_fs)

3
fs/hpfs/super.c
View File

@ -203,8 +203,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(hpfs_inode_cachep))
printk(KERN_INFO "hpfs_inode_cache: not all structures were freed\n");
kmem_cache_destroy(hpfs_inode_cachep);
}
/*

4
fs/isofs/inode.c
View File

@ -96,9 +96,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(isofs_inode_cachep))
printk(KERN_INFO "iso_inode_cache: not all structures were "
"freed\n");
kmem_cache_destroy(isofs_inode_cachep);
}
static int isofs_remount(struct super_block *sb, int *flags, char *data)

3
fs/minix/inode.c
View File

@ -90,8 +90,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(minix_inode_cachep))
printk(KERN_INFO "minix_inode_cache: not all structures were freed\n");
kmem_cache_destroy(minix_inode_cachep);
}
static struct super_operations minix_sops = {

3
fs/ncpfs/inode.c
View File

@ -81,8 +81,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(ncp_inode_cachep))
printk(KERN_INFO "ncp_inode_cache: not all structures were freed\n");
kmem_cache_destroy(ncp_inode_cachep);
}
static int ncp_remount(struct super_block *sb, int *flags, char* data)

3
fs/nfs/direct.c
View File

@ -855,6 +855,5 @@ int __init nfs_init_directcache(void)
*/
void nfs_destroy_directcache(void)
{
if (kmem_cache_destroy(nfs_direct_cachep))
printk(KERN_INFO "nfs_direct_cache: not all structures were freed\n");
kmem_cache_destroy(nfs_direct_cachep);
}

3
fs/nfs/inode.c
View File

@ -1134,8 +1134,7 @@ static int __init nfs_init_inodecache(void)
static void nfs_destroy_inodecache(void)
{
if (kmem_cache_destroy(nfs_inode_cachep))
printk(KERN_INFO "nfs_inode_cache: not all structures were freed\n");
kmem_cache_destroy(nfs_inode_cachep);
}
/*

3
fs/nfs/pagelist.c
View File

@ -392,7 +392,6 @@ int __init nfs_init_nfspagecache(void)
void nfs_destroy_nfspagecache(void)
{
if (kmem_cache_destroy(nfs_page_cachep))
printk(KERN_INFO "nfs_page: not all structures were freed\n");
kmem_cache_destroy(nfs_page_cachep);
}

3
fs/nfs/read.c
View File

@ -737,6 +737,5 @@ int __init nfs_init_readpagecache(void)
void nfs_destroy_readpagecache(void)
{
mempool_destroy(nfs_rdata_mempool);
if (kmem_cache_destroy(nfs_rdata_cachep))
printk(KERN_INFO "nfs_read_data: not all structures were freed\n");
kmem_cache_destroy(nfs_rdata_cachep);
}

3
fs/nfs/write.c
View File

@ -1565,7 +1565,6 @@ void nfs_destroy_writepagecache(void)
{
mempool_destroy(nfs_commit_mempool);
mempool_destroy(nfs_wdata_mempool);
if (kmem_cache_destroy(nfs_wdata_cachep))
printk(KERN_INFO "nfs_write_data: not all structures were freed\n");
kmem_cache_destroy(nfs_wdata_cachep);
}

5
fs/nfsd/nfs4state.c
View File

@ -1005,13 +1005,10 @@ alloc_init_file(struct inode *ino)
static void
nfsd4_free_slab(kmem_cache_t **slab)
{
int status;
if (*slab == NULL)
return;
status = kmem_cache_destroy(*slab);
kmem_cache_destroy(*slab);
*slab = NULL;
WARN_ON(status);
}
static void

28
fs/ntfs/super.c
View File

@ -3248,32 +3248,14 @@ static int __init init_ntfs_fs(void)
static void __exit exit_ntfs_fs(void)
{
int err = 0;
ntfs_debug("Unregistering NTFS driver.");
unregister_filesystem(&ntfs_fs_type);
if (kmem_cache_destroy(ntfs_big_inode_cache) && (err = 1))
printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
ntfs_big_inode_cache_name);
if (kmem_cache_destroy(ntfs_inode_cache) && (err = 1))
printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
ntfs_inode_cache_name);
if (kmem_cache_destroy(ntfs_name_cache) && (err = 1))
printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
ntfs_name_cache_name);
if (kmem_cache_destroy(ntfs_attr_ctx_cache) && (err = 1))
printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
ntfs_attr_ctx_cache_name);
if (kmem_cache_destroy(ntfs_index_ctx_cache) && (err = 1))
printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
ntfs_index_ctx_cache_name);
if (err)
printk(KERN_CRIT "NTFS: This causes memory to leak! There is "
"probably a BUG in the driver! Please report "
"you saw this message to "
"linux-ntfs-dev@lists.sourceforge.net\n");
kmem_cache_destroy(ntfs_big_inode_cache);
kmem_cache_destroy(ntfs_inode_cache);
kmem_cache_destroy(ntfs_name_cache);
kmem_cache_destroy(ntfs_attr_ctx_cache);
kmem_cache_destroy(ntfs_index_ctx_cache);
/* Unregister the ntfs sysctls. */
ntfs_sysctl(0);
}

4
fs/ocfs2/dlm/dlmfs.c
View File

@ -629,9 +629,7 @@ static void __exit exit_dlmfs_fs(void)
flush_workqueue(user_dlm_worker);
destroy_workqueue(user_dlm_worker);
if (kmem_cache_destroy(dlmfs_inode_cache))
printk(KERN_INFO "dlmfs_inode_cache: not all structures "
"were freed\n");
kmem_cache_destroy(dlmfs_inode_cache);
}
MODULE_AUTHOR("Oracle");

4
fs/qnx4/inode.c
View File

@ -556,9 +556,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(qnx4_inode_cachep))
printk(KERN_INFO
"qnx4_inode_cache: not all structures were freed\n");
kmem_cache_destroy(qnx4_inode_cachep);
}
static int qnx4_get_sb(struct file_system_type *fs_type,

4
fs/reiserfs/super.c
View File

@ -530,9 +530,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(reiserfs_inode_cachep))
reiserfs_warning(NULL,
"reiserfs_inode_cache: not all structures were freed");
kmem_cache_destroy(reiserfs_inode_cachep);
}
/* we don't mark inodes dirty, we just log them */

3
fs/romfs/inode.c
View File

@ -589,8 +589,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(romfs_inode_cachep))
printk(KERN_INFO "romfs_inode_cache: not all structures were freed\n");
kmem_cache_destroy(romfs_inode_cachep);
}
static int romfs_remount(struct super_block *sb, int *flags, char *data)

3
fs/smbfs/inode.c
View File

@ -89,8 +89,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(smb_inode_cachep))
printk(KERN_INFO "smb_inode_cache: not all structures were freed\n");
kmem_cache_destroy(smb_inode_cachep);
}
static int smb_remount(struct super_block *sb, int *flags, char *data)

3
fs/smbfs/request.c
View File

@ -49,8 +49,7 @@ int smb_init_request_cache(void)
void smb_destroy_request_cache(void)
{
if (kmem_cache_destroy(req_cachep))
printk(KERN_INFO "smb_destroy_request_cache: not all structures were freed\n");
kmem_cache_destroy(req_cachep);
}
/*

3
fs/udf/super.c
View File

@ -156,8 +156,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(udf_inode_cachep))
printk(KERN_INFO "udf_inode_cache: not all structures were freed\n");
kmem_cache_destroy(udf_inode_cachep);
}
/* Superblock operations */

3
fs/ufs/super.c
View File

@ -1244,8 +1244,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(ufs_inode_cachep))
printk(KERN_INFO "ufs_inode_cache: not all structures were freed\n");
kmem_cache_destroy(ufs_inode_cachep);
}
#ifdef CONFIG_QUOTA

4
fs/xfs/linux-2.6/kmem.h
View File

@ -91,8 +91,8 @@ kmem_zone_free(kmem_zone_t *zone, void *ptr)
static inline void
kmem_zone_destroy(kmem_zone_t *zone)
{
if (zone && kmem_cache_destroy(zone))
BUG();
if (zone)
kmem_cache_destroy(zone);
}
extern void *kmem_zone_alloc(kmem_zone_t *, unsigned int __nocast);

5
ipc/mqueue.c
View File

@ -1275,10 +1275,7 @@ static int __init init_mqueue_fs(void)
out_sysctl:
if (mq_sysctl_table)
unregister_sysctl_table(mq_sysctl_table);
if (kmem_cache_destroy(mqueue_inode_cachep)) {
printk(KERN_INFO
"mqueue_inode_cache: not all structures were freed\n");
}
kmem_cache_destroy(mqueue_inode_cachep);
return error;
}

3
mm/shmem.c
View File

@ -2157,8 +2157,7 @@ static int init_inodecache(void)
static void destroy_inodecache(void)
{
if (kmem_cache_destroy(shmem_inode_cachep))
printk(KERN_INFO "shmem_inode_cache: not all structures were freed\n");
kmem_cache_destroy(shmem_inode_cachep);
}
static const struct address_space_operations shmem_aops = {

3
net/sunrpc/rpc_pipe.c
View File

@ -858,7 +858,6 @@ int register_rpc_pipefs(void)
void unregister_rpc_pipefs(void)
{
if (kmem_cache_destroy(rpc_inode_cachep))
printk(KERN_WARNING "RPC: unable to free inode cache\n");
kmem_cache_destroy(rpc_inode_cachep);
unregister_filesystem(&rpc_pipe_fs_type);
}

8
net/sunrpc/sched.c
View File

@ -1059,10 +1059,10 @@ rpc_destroy_mempool(void)
mempool_destroy(rpc_buffer_mempool);
if (rpc_task_mempool)
mempool_destroy(rpc_task_mempool);
if (rpc_task_slabp && kmem_cache_destroy(rpc_task_slabp))
printk(KERN_INFO "rpc_task: not all structures were freed\n");
if (rpc_buffer_slabp && kmem_cache_destroy(rpc_buffer_slabp))
printk(KERN_INFO "rpc_buffers: not all structures were freed\n");
if (rpc_task_slabp)
kmem_cache_destroy(rpc_task_slabp);
if (rpc_buffer_slabp)
kmem_cache_destroy(rpc_buffer_slabp);
}
int