diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:25 -0500 |
commit | e18b890bb0881bbab6f4f1a6cd20d9c60d66b003 (patch) | |
tree | 4828be07e1c24781c264b42c5a75bcd968223c3f /drivers/scsi | |
parent | 441e143e95f5aa1e04026cb0aa71c801ba53982f (diff) |
[PATCH] slab: remove kmem_cache_t
Replace all uses of kmem_cache_t with struct kmem_cache.
The patch was generated using the following script:
#!/bin/sh
#
# Replace one string by another in all the kernel sources.
#
set -e
for file in `find * -name "*.c" -o -name "*.h"|xargs grep -l $1`; do
quilt add $file
sed -e "1,\$s/$1/$2/g" $file >/tmp/$$
mv /tmp/$$ $file
quilt refresh
done
The script was run like this
sh replace kmem_cache_t "struct kmem_cache"
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx.h | 4 | ||||
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_hwi.c | 2 | ||||
-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 |
9 files changed, 12 insertions, 12 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx.h b/drivers/scsi/aic94xx/aic94xx.h index 71a031df7a34..32f513b1b78a 100644 --- a/drivers/scsi/aic94xx/aic94xx.h +++ b/drivers/scsi/aic94xx/aic94xx.h | |||
@@ -56,8 +56,8 @@ | |||
56 | /* 2*ITNL timeout + 1 second */ | 56 | /* 2*ITNL timeout + 1 second */ |
57 | #define AIC94XX_SCB_TIMEOUT (5*HZ) | 57 | #define AIC94XX_SCB_TIMEOUT (5*HZ) |
58 | 58 | ||
59 | extern kmem_cache_t *asd_dma_token_cache; | 59 | extern struct kmem_cache *asd_dma_token_cache; |
60 | extern kmem_cache_t *asd_ascb_cache; | 60 | extern struct kmem_cache *asd_ascb_cache; |
61 | extern char sas_addr_str[2*SAS_ADDR_SIZE + 1]; | 61 | extern char sas_addr_str[2*SAS_ADDR_SIZE + 1]; |
62 | 62 | ||
63 | static inline void asd_stringify_sas_addr(char *p, const u8 *sas_addr) | 63 | static inline void asd_stringify_sas_addr(char *p, const u8 *sas_addr) |
diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c index af7e01134364..da94e126ca83 100644 --- a/drivers/scsi/aic94xx/aic94xx_hwi.c +++ b/drivers/scsi/aic94xx/aic94xx_hwi.c | |||
@@ -1047,7 +1047,7 @@ irqreturn_t asd_hw_isr(int irq, void *dev_id) | |||
1047 | static inline struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha, | 1047 | static inline struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha, |
1048 | gfp_t gfp_flags) | 1048 | gfp_t gfp_flags) |
1049 | { | 1049 | { |
1050 | extern kmem_cache_t *asd_ascb_cache; | 1050 | extern struct kmem_cache *asd_ascb_cache; |
1051 | struct asd_seq_data *seq = &asd_ha->seq; | 1051 | struct asd_seq_data *seq = &asd_ha->seq; |
1052 | struct asd_ascb *ascb; | 1052 | struct asd_ascb *ascb; |
1053 | unsigned long flags; | 1053 | unsigned long flags; |
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 42302ef05ee5..fbc82b00a418 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c | |||
@@ -450,8 +450,8 @@ static inline void asd_destroy_ha_caches(struct asd_ha_struct *asd_ha) | |||
450 | asd_ha->scb_pool = NULL; | 450 | asd_ha->scb_pool = NULL; |
451 | } | 451 | } |
452 | 452 | ||
453 | kmem_cache_t *asd_dma_token_cache; | 453 | struct kmem_cache *asd_dma_token_cache; |
454 | kmem_cache_t *asd_ascb_cache; | 454 | struct kmem_cache *asd_ascb_cache; |
455 | 455 | ||
456 | static int asd_create_global_caches(void) | 456 | static int asd_create_global_caches(void) |
457 | { | 457 | { |
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index d65bc4e0f214..2f0c07fc3f48 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | #include "../scsi_sas_internal.h" | 37 | #include "../scsi_sas_internal.h" |
38 | 38 | ||
39 | kmem_cache_t *sas_task_cache; | 39 | struct kmem_cache *sas_task_cache; |
40 | 40 | ||
41 | /*------------ SAS addr hash -----------*/ | 41 | /*------------ SAS addr hash -----------*/ |
42 | void sas_hash_addr(u8 *hashed, const u8 *sas_addr) | 42 | void sas_hash_addr(u8 *hashed, const u8 *sas_addr) |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index cbe0cad83b68..d03523d3bf38 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -24,7 +24,7 @@ char qla2x00_version_str[40]; | |||
24 | /* | 24 | /* |
25 | * SRB allocation cache | 25 | * SRB allocation cache |
26 | */ | 26 | */ |
27 | static kmem_cache_t *srb_cachep; | 27 | static struct kmem_cache *srb_cachep; |
28 | 28 | ||
29 | /* | 29 | /* |
30 | * Ioctl related information. | 30 | * Ioctl related information. |
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 969c9e431028..9ef693c8809a 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
@@ -19,7 +19,7 @@ char qla4xxx_version_str[40]; | |||
19 | /* | 19 | /* |
20 | * SRB allocation cache | 20 | * SRB allocation cache |
21 | */ | 21 | */ |
22 | static kmem_cache_t *srb_cachep; | 22 | static struct kmem_cache *srb_cachep; |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * Module parameter information and variables | 25 | * Module parameter information and variables |
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index fafc00deaade..24cffd98ee63 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c | |||
@@ -136,7 +136,7 @@ const char * scsi_device_type(unsigned type) | |||
136 | EXPORT_SYMBOL(scsi_device_type); | 136 | EXPORT_SYMBOL(scsi_device_type); |
137 | 137 | ||
138 | struct scsi_host_cmd_pool { | 138 | struct scsi_host_cmd_pool { |
139 | kmem_cache_t *slab; | 139 | struct kmem_cache *slab; |
140 | unsigned int users; | 140 | unsigned int users; |
141 | char *name; | 141 | char *name; |
142 | unsigned int slab_flags; | 142 | unsigned int slab_flags; |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index fb616c69151f..1748e27501cd 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -36,7 +36,7 @@ | |||
36 | struct scsi_host_sg_pool { | 36 | struct scsi_host_sg_pool { |
37 | size_t size; | 37 | size_t size; |
38 | char *name; | 38 | char *name; |
39 | kmem_cache_t *slab; | 39 | struct kmem_cache *slab; |
40 | mempool_t *pool; | 40 | mempool_t *pool; |
41 | }; | 41 | }; |
42 | 42 | ||
@@ -241,7 +241,7 @@ struct scsi_io_context { | |||
241 | char sense[SCSI_SENSE_BUFFERSIZE]; | 241 | char sense[SCSI_SENSE_BUFFERSIZE]; |
242 | }; | 242 | }; |
243 | 243 | ||
244 | static kmem_cache_t *scsi_io_context_cache; | 244 | static struct kmem_cache *scsi_io_context_cache; |
245 | 245 | ||
246 | static void scsi_end_async(struct request *req, int uptodate) | 246 | static void scsi_end_async(struct request *req, int uptodate) |
247 | { | 247 | { |
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c index 386dbae17b44..d402aff5f314 100644 --- a/drivers/scsi/scsi_tgt_lib.c +++ b/drivers/scsi/scsi_tgt_lib.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "scsi_tgt_priv.h" | 33 | #include "scsi_tgt_priv.h" |
34 | 34 | ||
35 | static struct workqueue_struct *scsi_tgtd; | 35 | static struct workqueue_struct *scsi_tgtd; |
36 | static kmem_cache_t *scsi_tgt_cmd_cache; | 36 | static struct kmem_cache *scsi_tgt_cmd_cache; |
37 | 37 | ||
38 | /* | 38 | /* |
39 | * TODO: this struct will be killed when the block layer supports large bios | 39 | * TODO: this struct will be killed when the block layer supports large bios |