diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /drivers/scsi/scsi_lib.c | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 | { |