aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-19 21:11:58 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-07-19 21:11:58 -0400
commit20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (patch)
tree415c4453d2b17a50abe7a3e515177e1fa337bd67 /drivers
parent64fb98fc40738ae1a98bcea9ca3145b89fb71524 (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 'drivers')
-rw-r--r--drivers/acpi/osl.c2
-rw-r--r--drivers/block/aoe/aoeblk.c4
-rw-r--r--drivers/ieee1394/eth1394.c2
-rw-r--r--drivers/infiniband/core/mad.c1
-rw-r--r--drivers/infiniband/hw/amso1100/c2_vq.c2
-rw-r--r--drivers/infiniband/hw/ehca/ehca_av.c2
-rw-r--r--drivers/infiniband/hw/ehca/ehca_cq.c2
-rw-r--r--drivers/infiniband/hw/ehca/ehca_main.c2
-rw-r--r--drivers/infiniband/hw/ehca/ehca_mrmw.c4
-rw-r--r--drivers/infiniband/hw/ehca/ehca_pd.c2
-rw-r--r--drivers/infiniband/hw/ehca/ehca_qp.c2
-rw-r--r--drivers/infiniband/ulp/iser/iscsi_iser.c2
-rw-r--r--drivers/kvm/mmu.c8
-rw-r--r--drivers/md/raid5.c4
-rw-r--r--drivers/message/i2o/i2o_block.c3
-rw-r--r--drivers/mtd/ubi/eba.c2
-rw-r--r--drivers/mtd/ubi/wl.c2
-rw-r--r--drivers/s390/block/dasd_devmap.c2
-rw-r--r--drivers/s390/scsi/zfcp_aux.c6
-rw-r--r--drivers/scsi/aic94xx/aic94xx_init.c4
-rw-r--r--drivers/scsi/libsas/sas_init.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c2
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c2
-rw-r--r--drivers/scsi/scsi.c2
-rw-r--r--drivers/scsi/scsi_lib.c4
-rw-r--r--drivers/scsi/scsi_tgt_lib.c2
-rw-r--r--drivers/usb/host/uhci-hcd.c2
-rw-r--r--drivers/usb/mon/mon_text.c2
28 files changed, 37 insertions, 39 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 2e7ba615d760..00d53c2fd1e8 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1098,7 +1098,7 @@ void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags flags)
1098acpi_status 1098acpi_status
1099acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache) 1099acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
1100{ 1100{
1101 *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL); 1101 *cache = kmem_cache_create(name, size, 0, 0, NULL);
1102 if (*cache == NULL) 1102 if (*cache == NULL)
1103 return AE_ERROR; 1103 return AE_ERROR;
1104 else 1104 else
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 478489c568a4..4f598270fa31 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -257,9 +257,9 @@ aoeblk_exit(void)
257int __init 257int __init
258aoeblk_init(void) 258aoeblk_init(void)
259{ 259{
260 buf_pool_cache = kmem_cache_create("aoe_bufs", 260 buf_pool_cache = kmem_cache_create("aoe_bufs",
261 sizeof(struct buf), 261 sizeof(struct buf),
262 0, 0, NULL, NULL); 262 0, 0, NULL);
263 if (buf_pool_cache == NULL) 263 if (buf_pool_cache == NULL)
264 return -ENOMEM; 264 return -ENOMEM;
265 265
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 93362eed94ed..3a9d7e2d4de6 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1729,7 +1729,7 @@ static int __init ether1394_init_module(void)
1729 1729
1730 packet_task_cache = kmem_cache_create("packet_task", 1730 packet_task_cache = kmem_cache_create("packet_task",
1731 sizeof(struct packet_task), 1731 sizeof(struct packet_task),
1732 0, 0, NULL, NULL); 1732 0, 0, NULL);
1733 if (!packet_task_cache) 1733 if (!packet_task_cache)
1734 return -ENOMEM; 1734 return -ENOMEM;
1735 1735
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 6b8faca02f8a..bc547f1d34ba 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -2998,7 +2998,6 @@ static int __init ib_mad_init_module(void)
2998 sizeof(struct ib_mad_private), 2998 sizeof(struct ib_mad_private),
2999 0, 2999 0,
3000 SLAB_HWCACHE_ALIGN, 3000 SLAB_HWCACHE_ALIGN,
3001 NULL,
3002 NULL); 3001 NULL);
3003 if (!ib_mad_cache) { 3002 if (!ib_mad_cache) {
3004 printk(KERN_ERR PFX "Couldn't create ib_mad cache\n"); 3003 printk(KERN_ERR PFX "Couldn't create ib_mad cache\n");
diff --git a/drivers/infiniband/hw/amso1100/c2_vq.c b/drivers/infiniband/hw/amso1100/c2_vq.c
index 36620a22413c..cfdacb1ec279 100644
--- a/drivers/infiniband/hw/amso1100/c2_vq.c
+++ b/drivers/infiniband/hw/amso1100/c2_vq.c
@@ -85,7 +85,7 @@ int vq_init(struct c2_dev *c2dev)
85 (char) ('0' + c2dev->devnum)); 85 (char) ('0' + c2dev->devnum));
86 c2dev->host_msg_cache = 86 c2dev->host_msg_cache =
87 kmem_cache_create(c2dev->vq_cache_name, c2dev->rep_vq.msg_size, 0, 87 kmem_cache_create(c2dev->vq_cache_name, c2dev->rep_vq.msg_size, 0,
88 SLAB_HWCACHE_ALIGN, NULL, NULL); 88 SLAB_HWCACHE_ALIGN, NULL);
89 if (c2dev->host_msg_cache == NULL) { 89 if (c2dev->host_msg_cache == NULL) {
90 return -ENOMEM; 90 return -ENOMEM;
91 } 91 }
diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c
index e53a97af1260..97d108634c58 100644
--- a/drivers/infiniband/hw/ehca/ehca_av.c
+++ b/drivers/infiniband/hw/ehca/ehca_av.c
@@ -259,7 +259,7 @@ int ehca_init_av_cache(void)
259 av_cache = kmem_cache_create("ehca_cache_av", 259 av_cache = kmem_cache_create("ehca_cache_av",
260 sizeof(struct ehca_av), 0, 260 sizeof(struct ehca_av), 0,
261 SLAB_HWCACHE_ALIGN, 261 SLAB_HWCACHE_ALIGN,
262 NULL, NULL); 262 NULL);
263 if (!av_cache) 263 if (!av_cache)
264 return -ENOMEM; 264 return -ENOMEM;
265 return 0; 265 return 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c
index 9e87883b561a..1e8ca3fca4aa 100644
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
@@ -387,7 +387,7 @@ int ehca_init_cq_cache(void)
387 cq_cache = kmem_cache_create("ehca_cache_cq", 387 cq_cache = kmem_cache_create("ehca_cache_cq",
388 sizeof(struct ehca_cq), 0, 388 sizeof(struct ehca_cq), 0,
389 SLAB_HWCACHE_ALIGN, 389 SLAB_HWCACHE_ALIGN,
390 NULL, NULL); 390 NULL);
391 if (!cq_cache) 391 if (!cq_cache)
392 return -ENOMEM; 392 return -ENOMEM;
393 return 0; 393 return 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 36377c6db3d4..04c324330b7c 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -163,7 +163,7 @@ static int ehca_create_slab_caches(void)
163 ctblk_cache = kmem_cache_create("ehca_cache_ctblk", 163 ctblk_cache = kmem_cache_create("ehca_cache_ctblk",
164 EHCA_PAGESIZE, H_CB_ALIGNMENT, 164 EHCA_PAGESIZE, H_CB_ALIGNMENT,
165 SLAB_HWCACHE_ALIGN, 165 SLAB_HWCACHE_ALIGN,
166 NULL, NULL); 166 NULL);
167 if (!ctblk_cache) { 167 if (!ctblk_cache) {
168 ehca_gen_err("Cannot create ctblk SLAB cache."); 168 ehca_gen_err("Cannot create ctblk SLAB cache.");
169 ehca_cleanup_mrmw_cache(); 169 ehca_cleanup_mrmw_cache();
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c
index 6262c5462d50..9f4c9d46e8ef 100644
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -1950,13 +1950,13 @@ int ehca_init_mrmw_cache(void)
1950 mr_cache = kmem_cache_create("ehca_cache_mr", 1950 mr_cache = kmem_cache_create("ehca_cache_mr",
1951 sizeof(struct ehca_mr), 0, 1951 sizeof(struct ehca_mr), 0,
1952 SLAB_HWCACHE_ALIGN, 1952 SLAB_HWCACHE_ALIGN,
1953 NULL, NULL); 1953 NULL);
1954 if (!mr_cache) 1954 if (!mr_cache)
1955 return -ENOMEM; 1955 return -ENOMEM;
1956 mw_cache = kmem_cache_create("ehca_cache_mw", 1956 mw_cache = kmem_cache_create("ehca_cache_mw",
1957 sizeof(struct ehca_mw), 0, 1957 sizeof(struct ehca_mw), 0,
1958 SLAB_HWCACHE_ALIGN, 1958 SLAB_HWCACHE_ALIGN,
1959 NULL, NULL); 1959 NULL);
1960 if (!mw_cache) { 1960 if (!mw_cache) {
1961 kmem_cache_destroy(mr_cache); 1961 kmem_cache_destroy(mr_cache);
1962 mr_cache = NULL; 1962 mr_cache = NULL;
diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c b/drivers/infiniband/hw/ehca/ehca_pd.c
index 79d0591a8043..c85312ad292b 100644
--- a/drivers/infiniband/hw/ehca/ehca_pd.c
+++ b/drivers/infiniband/hw/ehca/ehca_pd.c
@@ -100,7 +100,7 @@ int ehca_init_pd_cache(void)
100 pd_cache = kmem_cache_create("ehca_cache_pd", 100 pd_cache = kmem_cache_create("ehca_cache_pd",
101 sizeof(struct ehca_pd), 0, 101 sizeof(struct ehca_pd), 0,
102 SLAB_HWCACHE_ALIGN, 102 SLAB_HWCACHE_ALIGN,
103 NULL, NULL); 103 NULL);
104 if (!pd_cache) 104 if (!pd_cache)
105 return -ENOMEM; 105 return -ENOMEM;
106 return 0; 106 return 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 48e9ceacd6fa..a3146e696c5d 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -1760,7 +1760,7 @@ int ehca_init_qp_cache(void)
1760 qp_cache = kmem_cache_create("ehca_cache_qp", 1760 qp_cache = kmem_cache_create("ehca_cache_qp",
1761 sizeof(struct ehca_qp), 0, 1761 sizeof(struct ehca_qp), 0,
1762 SLAB_HWCACHE_ALIGN, 1762 SLAB_HWCACHE_ALIGN,
1763 NULL, NULL); 1763 NULL);
1764 if (!qp_cache) 1764 if (!qp_cache)
1765 return -ENOMEM; 1765 return -ENOMEM;
1766 return 0; 1766 return 0;
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index effdee299b0c..5db314380271 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -637,7 +637,7 @@ static int __init iser_init(void)
637 ig.desc_cache = kmem_cache_create("iser_descriptors", 637 ig.desc_cache = kmem_cache_create("iser_descriptors",
638 sizeof (struct iser_desc), 638 sizeof (struct iser_desc),
639 0, SLAB_HWCACHE_ALIGN, 639 0, SLAB_HWCACHE_ALIGN,
640 NULL, NULL); 640 NULL);
641 if (ig.desc_cache == NULL) 641 if (ig.desc_cache == NULL)
642 return -ENOMEM; 642 return -ENOMEM;
643 643
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index b297a6b111ac..1199d3f32ac3 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -1332,24 +1332,24 @@ int kvm_mmu_module_init(void)
1332{ 1332{
1333 pte_chain_cache = kmem_cache_create("kvm_pte_chain", 1333 pte_chain_cache = kmem_cache_create("kvm_pte_chain",
1334 sizeof(struct kvm_pte_chain), 1334 sizeof(struct kvm_pte_chain),
1335 0, 0, NULL, NULL); 1335 0, 0, NULL);
1336 if (!pte_chain_cache) 1336 if (!pte_chain_cache)
1337 goto nomem; 1337 goto nomem;
1338 rmap_desc_cache = kmem_cache_create("kvm_rmap_desc", 1338 rmap_desc_cache = kmem_cache_create("kvm_rmap_desc",
1339 sizeof(struct kvm_rmap_desc), 1339 sizeof(struct kvm_rmap_desc),
1340 0, 0, NULL, NULL); 1340 0, 0, NULL);
1341 if (!rmap_desc_cache) 1341 if (!rmap_desc_cache)
1342 goto nomem; 1342 goto nomem;
1343 1343
1344 mmu_page_cache = kmem_cache_create("kvm_mmu_page", 1344 mmu_page_cache = kmem_cache_create("kvm_mmu_page",
1345 PAGE_SIZE, 1345 PAGE_SIZE,
1346 PAGE_SIZE, 0, NULL, NULL); 1346 PAGE_SIZE, 0, NULL);
1347 if (!mmu_page_cache) 1347 if (!mmu_page_cache)
1348 goto nomem; 1348 goto nomem;
1349 1349
1350 mmu_page_header_cache = kmem_cache_create("kvm_mmu_page_header", 1350 mmu_page_header_cache = kmem_cache_create("kvm_mmu_page_header",
1351 sizeof(struct kvm_mmu_page), 1351 sizeof(struct kvm_mmu_page),
1352 0, 0, NULL, NULL); 1352 0, 0, NULL);
1353 if (!mmu_page_header_cache) 1353 if (!mmu_page_header_cache)
1354 goto nomem; 1354 goto nomem;
1355 1355
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 0b66afef2d82..c8dfdb302916 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -951,7 +951,7 @@ static int grow_stripes(raid5_conf_t *conf, int num)
951 conf->active_name = 0; 951 conf->active_name = 0;
952 sc = kmem_cache_create(conf->cache_name[conf->active_name], 952 sc = kmem_cache_create(conf->cache_name[conf->active_name],
953 sizeof(struct stripe_head)+(devs-1)*sizeof(struct r5dev), 953 sizeof(struct stripe_head)+(devs-1)*sizeof(struct r5dev),
954 0, 0, NULL, NULL); 954 0, 0, NULL);
955 if (!sc) 955 if (!sc)
956 return 1; 956 return 1;
957 conf->slab_cache = sc; 957 conf->slab_cache = sc;
@@ -1003,7 +1003,7 @@ static int resize_stripes(raid5_conf_t *conf, int newsize)
1003 /* Step 1 */ 1003 /* Step 1 */
1004 sc = kmem_cache_create(conf->cache_name[1-conf->active_name], 1004 sc = kmem_cache_create(conf->cache_name[1-conf->active_name],
1005 sizeof(struct stripe_head)+(newsize-1)*sizeof(struct r5dev), 1005 sizeof(struct stripe_head)+(newsize-1)*sizeof(struct r5dev),
1006 0, 0, NULL, NULL); 1006 0, 0, NULL);
1007 if (!sc) 1007 if (!sc)
1008 return -ENOMEM; 1008 return -ENOMEM;
1009 1009
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 64a52bd7544a..988c8ce47f58 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -1171,8 +1171,7 @@ static int __init i2o_block_init(void)
1171 /* Allocate request mempool and slab */ 1171 /* Allocate request mempool and slab */
1172 size = sizeof(struct i2o_block_request); 1172 size = sizeof(struct i2o_block_request);
1173 i2o_blk_req_pool.slab = kmem_cache_create("i2o_block_req", size, 0, 1173 i2o_blk_req_pool.slab = kmem_cache_create("i2o_block_req", size, 0,
1174 SLAB_HWCACHE_ALIGN, NULL, 1174 SLAB_HWCACHE_ALIGN, NULL);
1175 NULL);
1176 if (!i2o_blk_req_pool.slab) { 1175 if (!i2o_blk_req_pool.slab) {
1177 osm_err("can't init request slab\n"); 1176 osm_err("can't init request slab\n");
1178 rc = -ENOMEM; 1177 rc = -ENOMEM;
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 8aff9385613f..7c5e29eaf118 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -1149,7 +1149,7 @@ int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
1149 if (ubi_devices_cnt == 0) { 1149 if (ubi_devices_cnt == 0) {
1150 ltree_slab = kmem_cache_create("ubi_ltree_slab", 1150 ltree_slab = kmem_cache_create("ubi_ltree_slab",
1151 sizeof(struct ltree_entry), 0, 1151 sizeof(struct ltree_entry), 0,
1152 0, &ltree_entry_ctor, NULL); 1152 0, &ltree_entry_ctor);
1153 if (!ltree_slab) 1153 if (!ltree_slab)
1154 return -ENOMEM; 1154 return -ENOMEM;
1155 } 1155 }
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 9de953762097..a5a9b8d87302 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1452,7 +1452,7 @@ int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
1452 if (ubi_devices_cnt == 0) { 1452 if (ubi_devices_cnt == 0) {
1453 wl_entries_slab = kmem_cache_create("ubi_wl_entry_slab", 1453 wl_entries_slab = kmem_cache_create("ubi_wl_entry_slab",
1454 sizeof(struct ubi_wl_entry), 1454 sizeof(struct ubi_wl_entry),
1455 0, 0, NULL, NULL); 1455 0, 0, NULL);
1456 if (!wl_entries_slab) 1456 if (!wl_entries_slab)
1457 return -ENOMEM; 1457 return -ENOMEM;
1458 } 1458 }
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 6a89cefe99bb..0c67258fb9ec 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -291,7 +291,7 @@ dasd_parse_keyword( char *parsestring ) {
291 dasd_page_cache = 291 dasd_page_cache =
292 kmem_cache_create("dasd_page_cache", PAGE_SIZE, 292 kmem_cache_create("dasd_page_cache", PAGE_SIZE,
293 PAGE_SIZE, SLAB_CACHE_DMA, 293 PAGE_SIZE, SLAB_CACHE_DMA,
294 NULL, NULL ); 294 NULL);
295 if (!dasd_page_cache) 295 if (!dasd_page_cache)
296 MESSAGE(KERN_WARNING, "%s", "Failed to create slab, " 296 MESSAGE(KERN_WARNING, "%s", "Failed to create slab, "
297 "fixed buffer mode disabled."); 297 "fixed buffer mode disabled.");
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index a1db95925138..9726261c367d 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -259,21 +259,21 @@ zfcp_module_init(void)
259 size = sizeof(struct zfcp_fsf_req_qtcb); 259 size = sizeof(struct zfcp_fsf_req_qtcb);
260 align = calc_alignment(size); 260 align = calc_alignment(size);
261 zfcp_data.fsf_req_qtcb_cache = 261 zfcp_data.fsf_req_qtcb_cache =
262 kmem_cache_create("zfcp_fsf", size, align, 0, NULL, NULL); 262 kmem_cache_create("zfcp_fsf", size, align, 0, NULL);
263 if (!zfcp_data.fsf_req_qtcb_cache) 263 if (!zfcp_data.fsf_req_qtcb_cache)
264 goto out; 264 goto out;
265 265
266 size = sizeof(struct fsf_status_read_buffer); 266 size = sizeof(struct fsf_status_read_buffer);
267 align = calc_alignment(size); 267 align = calc_alignment(size);
268 zfcp_data.sr_buffer_cache = 268 zfcp_data.sr_buffer_cache =
269 kmem_cache_create("zfcp_sr", size, align, 0, NULL, NULL); 269 kmem_cache_create("zfcp_sr", size, align, 0, NULL);
270 if (!zfcp_data.sr_buffer_cache) 270 if (!zfcp_data.sr_buffer_cache)
271 goto out_sr_cache; 271 goto out_sr_cache;
272 272
273 size = sizeof(struct zfcp_gid_pn_data); 273 size = sizeof(struct zfcp_gid_pn_data);
274 align = calc_alignment(size); 274 align = calc_alignment(size);
275 zfcp_data.gid_pn_cache = 275 zfcp_data.gid_pn_cache =
276 kmem_cache_create("zfcp_gid", size, align, 0, NULL, NULL); 276 kmem_cache_create("zfcp_gid", size, align, 0, NULL);
277 if (!zfcp_data.gid_pn_cache) 277 if (!zfcp_data.gid_pn_cache)
278 goto out_gid_cache; 278 goto out_gid_cache;
279 279
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 1c0d7578e791..b8c6810090d5 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -462,7 +462,7 @@ static int asd_create_global_caches(void)
462 sizeof(struct asd_dma_tok), 462 sizeof(struct asd_dma_tok),
463 0, 463 0,
464 SLAB_HWCACHE_ALIGN, 464 SLAB_HWCACHE_ALIGN,
465 NULL, NULL); 465 NULL);
466 if (!asd_dma_token_cache) { 466 if (!asd_dma_token_cache) {
467 asd_printk("couldn't create dma token cache\n"); 467 asd_printk("couldn't create dma token cache\n");
468 return -ENOMEM; 468 return -ENOMEM;
@@ -474,7 +474,7 @@ static int asd_create_global_caches(void)
474 sizeof(struct asd_ascb), 474 sizeof(struct asd_ascb),
475 0, 475 0,
476 SLAB_HWCACHE_ALIGN, 476 SLAB_HWCACHE_ALIGN,
477 NULL, NULL); 477 NULL);
478 if (!asd_ascb_cache) { 478 if (!asd_ascb_cache) {
479 asd_printk("couldn't create ascb cache\n"); 479 asd_printk("couldn't create ascb cache\n");
480 goto Err; 480 goto Err;
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 965698c8b7bf..1396c83b0c9c 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -292,7 +292,7 @@ EXPORT_SYMBOL_GPL(sas_domain_release_transport);
292static int __init sas_class_init(void) 292static int __init sas_class_init(void)
293{ 293{
294 sas_task_cache = kmem_cache_create("sas_task", sizeof(struct sas_task), 294 sas_task_cache = kmem_cache_create("sas_task", sizeof(struct sas_task),
295 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 295 0, SLAB_HWCACHE_ALIGN, NULL);
296 if (!sas_task_cache) 296 if (!sas_task_cache)
297 return -ENOMEM; 297 return -ENOMEM;
298 298
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index b5a77b0c0deb..92376f9dfdd5 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2723,7 +2723,7 @@ qla2x00_module_init(void)
2723 2723
2724 /* Allocate cache for SRBs. */ 2724 /* Allocate cache for SRBs. */
2725 srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0, 2725 srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,
2726 SLAB_HWCACHE_ALIGN, NULL, NULL); 2726 SLAB_HWCACHE_ALIGN, NULL);
2727 if (srb_cachep == NULL) { 2727 if (srb_cachep == NULL) {
2728 printk(KERN_ERR 2728 printk(KERN_ERR
2729 "qla2xxx: Unable to allocate SRB cache...Failing load!\n"); 2729 "qla2xxx: Unable to allocate SRB cache...Failing load!\n");
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index e69160a7bc60..b1d565c12c5b 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1677,7 +1677,7 @@ static int __init qla4xxx_module_init(void)
1677 1677
1678 /* Allocate cache for SRBs. */ 1678 /* Allocate cache for SRBs. */
1679 srb_cachep = kmem_cache_create("qla4xxx_srbs", sizeof(struct srb), 0, 1679 srb_cachep = kmem_cache_create("qla4xxx_srbs", sizeof(struct srb), 0,
1680 SLAB_HWCACHE_ALIGN, NULL, NULL); 1680 SLAB_HWCACHE_ALIGN, NULL);
1681 if (srb_cachep == NULL) { 1681 if (srb_cachep == NULL) {
1682 printk(KERN_ERR 1682 printk(KERN_ERR
1683 "%s: Unable to allocate SRB cache..." 1683 "%s: Unable to allocate SRB cache..."
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index a691dda40d2c..a5de1a829a76 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -288,7 +288,7 @@ int scsi_setup_command_freelist(struct Scsi_Host *shost)
288 if (!pool->users) { 288 if (!pool->users) {
289 pool->slab = kmem_cache_create(pool->name, 289 pool->slab = kmem_cache_create(pool->name,
290 sizeof(struct scsi_cmnd), 0, 290 sizeof(struct scsi_cmnd), 0,
291 pool->slab_flags, NULL, NULL); 291 pool->slab_flags, NULL);
292 if (!pool->slab) 292 if (!pool->slab)
293 goto fail; 293 goto fail;
294 } 294 }
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 1f5a07bf2a75..da63c544919b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1661,7 +1661,7 @@ int __init scsi_init_queue(void)
1661 1661
1662 scsi_io_context_cache = kmem_cache_create("scsi_io_context", 1662 scsi_io_context_cache = kmem_cache_create("scsi_io_context",
1663 sizeof(struct scsi_io_context), 1663 sizeof(struct scsi_io_context),
1664 0, 0, NULL, NULL); 1664 0, 0, NULL);
1665 if (!scsi_io_context_cache) { 1665 if (!scsi_io_context_cache) {
1666 printk(KERN_ERR "SCSI: can't init scsi io context cache\n"); 1666 printk(KERN_ERR "SCSI: can't init scsi io context cache\n");
1667 return -ENOMEM; 1667 return -ENOMEM;
@@ -1672,7 +1672,7 @@ int __init scsi_init_queue(void)
1672 int size = sgp->size * sizeof(struct scatterlist); 1672 int size = sgp->size * sizeof(struct scatterlist);
1673 1673
1674 sgp->slab = kmem_cache_create(sgp->name, size, 0, 1674 sgp->slab = kmem_cache_create(sgp->name, size, 0,
1675 SLAB_HWCACHE_ALIGN, NULL, NULL); 1675 SLAB_HWCACHE_ALIGN, NULL);
1676 if (!sgp->slab) { 1676 if (!sgp->slab) {
1677 printk(KERN_ERR "SCSI: can't init sg slab %s\n", 1677 printk(KERN_ERR "SCSI: can't init sg slab %s\n",
1678 sgp->name); 1678 sgp->name);
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index 2570f48a69c7..371b69c110bc 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -585,7 +585,7 @@ static int __init scsi_tgt_init(void)
585 585
586 scsi_tgt_cmd_cache = kmem_cache_create("scsi_tgt_cmd", 586 scsi_tgt_cmd_cache = kmem_cache_create("scsi_tgt_cmd",
587 sizeof(struct scsi_tgt_cmd), 587 sizeof(struct scsi_tgt_cmd),
588 0, 0, NULL, NULL); 588 0, 0, NULL);
589 if (!scsi_tgt_cmd_cache) 589 if (!scsi_tgt_cmd_cache)
590 return -ENOMEM; 590 return -ENOMEM;
591 591
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 76c555a67dac..805e5fc5f5db 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -933,7 +933,7 @@ static int __init uhci_hcd_init(void)
933 } 933 }
934 934
935 uhci_up_cachep = kmem_cache_create("uhci_urb_priv", 935 uhci_up_cachep = kmem_cache_create("uhci_urb_priv",
936 sizeof(struct urb_priv), 0, 0, NULL, NULL); 936 sizeof(struct urb_priv), 0, 0, NULL);
937 if (!uhci_up_cachep) 937 if (!uhci_up_cachep)
938 goto up_failed; 938 goto up_failed;
939 939
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index 982b773d71e6..8f27a9e1c36b 100644
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -340,7 +340,7 @@ static int mon_text_open(struct inode *inode, struct file *file)
340 snprintf(rp->slab_name, SLAB_NAME_SZ, "mon_text_%p", rp); 340 snprintf(rp->slab_name, SLAB_NAME_SZ, "mon_text_%p", rp);
341 rp->e_slab = kmem_cache_create(rp->slab_name, 341 rp->e_slab = kmem_cache_create(rp->slab_name,
342 sizeof(struct mon_event_text), sizeof(long), 0, 342 sizeof(struct mon_event_text), sizeof(long), 0,
343 mon_text_ctor, NULL); 343 mon_text_ctor);
344 if (rp->e_slab == NULL) { 344 if (rp->e_slab == NULL) {
345 rc = -ENOMEM; 345 rc = -ENOMEM;
346 goto err_slab; 346 goto err_slab;
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-07 23:11:00 -0500