git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
fs
/
nfs
/
write.c
diff --git
a/fs/nfs/write.c
b/fs/nfs/write.c
index
c6e523a
..
301391a
100644
(file)
--- a/
fs/nfs/write.c
+++ b/
fs/nfs/write.c
@@
-1742,12
+1742,12
@@
int __init nfs_init_writepagecache(void)
nfs_wdata_mempool = mempool_create_slab_pool(MIN_POOL_WRITE,
nfs_wdata_cachep);
if (nfs_wdata_mempool == NULL)
nfs_wdata_mempool = mempool_create_slab_pool(MIN_POOL_WRITE,
nfs_wdata_cachep);
if (nfs_wdata_mempool == NULL)
-
return -ENOMEM
;
+
goto out_destroy_write_cache
;
nfs_commit_mempool = mempool_create_slab_pool(MIN_POOL_COMMIT,
nfs_wdata_cachep);
if (nfs_commit_mempool == NULL)
nfs_commit_mempool = mempool_create_slab_pool(MIN_POOL_COMMIT,
nfs_wdata_cachep);
if (nfs_commit_mempool == NULL)
-
return -ENOMEM
;
+
goto out_destroy_write_mempool
;
/*
* NFS congestion size, scale with available memory.
/*
* NFS congestion size, scale with available memory.
@@
-1770,6
+1770,12
@@
int __init nfs_init_writepagecache(void)
nfs_congestion_kb = 256*1024;
return 0;
nfs_congestion_kb = 256*1024;
return 0;
+
+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)