iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfs: tear down caches in nfs_init_writepagecache when allocation fails

Browse Source 
...and ensure that we tear down the nfs_commit_data cache too when
unloading the module.

Cc: Bryan Schumaker <bjschuma@netapp.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Jeff Layton 2012-08-02 14:30:56 -04:00 committed by Trond Myklebust
parent 2d53492620
commit 3dd4765fce
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/nfs/write.c
View File

@ -1814,19 +1814,19 @@ int __init nfs_init_writepagecache(void)
nfs_wdata_mempool = mempool_create_slab_pool(MIN_POOL_WRITE, nfs_wdata_mempool = mempool_create_slab_pool(MIN_POOL_WRITE,
nfs_wdata_cachep); nfs_wdata_cachep);
if (nfs_wdata_mempool == NULL) if (nfs_wdata_mempool == NULL)
return -ENOMEM; goto out_destroy_write_cache;
nfs_cdata_cachep = kmem_cache_create("nfs_commit_data", nfs_cdata_cachep = kmem_cache_create("nfs_commit_data",
sizeof(struct nfs_commit_data), sizeof(struct nfs_commit_data),
0, SLAB_HWCACHE_ALIGN, 0, SLAB_HWCACHE_ALIGN,
NULL); NULL);
if (nfs_cdata_cachep == NULL) if (nfs_cdata_cachep == NULL)
return -ENOMEM; goto out_destroy_write_mempool;
nfs_commit_mempool = mempool_create_slab_pool(MIN_POOL_COMMIT, nfs_commit_mempool = mempool_create_slab_pool(MIN_POOL_COMMIT,
nfs_wdata_cachep); nfs_wdata_cachep);
if (nfs_commit_mempool == NULL) if (nfs_commit_mempool == NULL)
return -ENOMEM; goto out_destroy_commit_cache;
/* /*
* NFS congestion size, scale with available memory. * NFS congestion size, scale with available memory.
@ -1849,11 +1849,20 @@ int __init nfs_init_writepagecache(void)
nfs_congestion_kb = 256*1024; nfs_congestion_kb = 256*1024;
return 0; return 0;
out_destroy_commit_cache:
kmem_cache_destroy(nfs_cdata_cachep);
out_destroy_write_mempool:
mempool_destroy(nfs_wdata_mempool);
out_destroy_write_cache:
kmem_cache_destroy(nfs_wdata_cachep);
return -ENOMEM;
} }
void nfs_destroy_writepagecache(void) void nfs_destroy_writepagecache(void)
{ {
mempool_destroy(nfs_commit_mempool); mempool_destroy(nfs_commit_mempool);
kmem_cache_destroy(nfs_cdata_cachep);
mempool_destroy(nfs_wdata_mempool); mempool_destroy(nfs_wdata_mempool);
kmem_cache_destroy(nfs_wdata_cachep); kmem_cache_destroy(nfs_wdata_cachep);
} }