diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-07-19 21:11:58 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-19 21:11:58 -0400 |
commit | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (patch) | |
tree | 415c4453d2b17a50abe7a3e515177e1fa337bd67 /fs/cifs/cifsfs.c | |
parent | 64fb98fc40738ae1a98bcea9ca3145b89fb71524 (diff) |
mm: Remove slab destructors from kmem_cache_create().
Slab destructors were no longer supported after Christoph's
c59def9f222d44bb7e2f0a559f2906191a0862d7 change. They've been
BUGs for both slab and slub, and slob never supported them
either.
This rips out support for the dtor pointer from kmem_cache_create()
completely and fixes up every single callsite in the kernel (there were
about 224, not including the slab allocator definitions themselves,
or the documentation references).
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 1fd0dc85f53c..cabb6a55d7dd 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -719,7 +719,7 @@ cifs_init_inodecache(void) | |||
719 | sizeof (struct cifsInodeInfo), | 719 | sizeof (struct cifsInodeInfo), |
720 | 0, (SLAB_RECLAIM_ACCOUNT| | 720 | 0, (SLAB_RECLAIM_ACCOUNT| |
721 | SLAB_MEM_SPREAD), | 721 | SLAB_MEM_SPREAD), |
722 | cifs_init_once, NULL); | 722 | cifs_init_once); |
723 | if (cifs_inode_cachep == NULL) | 723 | if (cifs_inode_cachep == NULL) |
724 | return -ENOMEM; | 724 | return -ENOMEM; |
725 | 725 | ||
@@ -748,7 +748,7 @@ cifs_init_request_bufs(void) | |||
748 | cifs_req_cachep = kmem_cache_create("cifs_request", | 748 | cifs_req_cachep = kmem_cache_create("cifs_request", |
749 | CIFSMaxBufSize + | 749 | CIFSMaxBufSize + |
750 | MAX_CIFS_HDR_SIZE, 0, | 750 | MAX_CIFS_HDR_SIZE, 0, |
751 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 751 | SLAB_HWCACHE_ALIGN, NULL); |
752 | if (cifs_req_cachep == NULL) | 752 | if (cifs_req_cachep == NULL) |
753 | return -ENOMEM; | 753 | return -ENOMEM; |
754 | 754 | ||
@@ -776,7 +776,7 @@ cifs_init_request_bufs(void) | |||
776 | alloc of large cifs buffers even when page debugging is on */ | 776 | alloc of large cifs buffers even when page debugging is on */ |
777 | cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq", | 777 | cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq", |
778 | MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN, | 778 | MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN, |
779 | NULL, NULL); | 779 | NULL); |
780 | if (cifs_sm_req_cachep == NULL) { | 780 | if (cifs_sm_req_cachep == NULL) { |
781 | mempool_destroy(cifs_req_poolp); | 781 | mempool_destroy(cifs_req_poolp); |
782 | kmem_cache_destroy(cifs_req_cachep); | 782 | kmem_cache_destroy(cifs_req_cachep); |
@@ -817,7 +817,7 @@ cifs_init_mids(void) | |||
817 | { | 817 | { |
818 | cifs_mid_cachep = kmem_cache_create("cifs_mpx_ids", | 818 | cifs_mid_cachep = kmem_cache_create("cifs_mpx_ids", |
819 | sizeof (struct mid_q_entry), 0, | 819 | sizeof (struct mid_q_entry), 0, |
820 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 820 | SLAB_HWCACHE_ALIGN, NULL); |
821 | if (cifs_mid_cachep == NULL) | 821 | if (cifs_mid_cachep == NULL) |
822 | return -ENOMEM; | 822 | return -ENOMEM; |
823 | 823 | ||
@@ -830,7 +830,7 @@ cifs_init_mids(void) | |||
830 | 830 | ||
831 | cifs_oplock_cachep = kmem_cache_create("cifs_oplock_structs", | 831 | cifs_oplock_cachep = kmem_cache_create("cifs_oplock_structs", |
832 | sizeof (struct oplock_q_entry), 0, | 832 | sizeof (struct oplock_q_entry), 0, |
833 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 833 | SLAB_HWCACHE_ALIGN, NULL); |
834 | if (cifs_oplock_cachep == NULL) { | 834 | if (cifs_oplock_cachep == NULL) { |
835 | mempool_destroy(cifs_mid_poolp); | 835 | mempool_destroy(cifs_mid_poolp); |
836 | kmem_cache_destroy(cifs_mid_cachep); | 836 | kmem_cache_destroy(cifs_mid_cachep); |