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 /drivers/scsi | |
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 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_init.c | 4 | ||||
-rw-r--r-- | drivers/scsi/libsas/sas_init.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 2 | ||||
-rw-r--r-- | drivers/scsi/scsi.c | 2 | ||||
-rw-r--r-- | drivers/scsi/scsi_lib.c | 4 | ||||
-rw-r--r-- | drivers/scsi/scsi_tgt_lib.c | 2 |
7 files changed, 9 insertions, 9 deletions
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); | |||
292 | static int __init sas_class_init(void) | 292 | static 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 | ||