diff options
Diffstat (limited to 'block')
-rw-r--r-- | block/cfq-iosched.c | 4 | ||||
-rw-r--r-- | block/ll_rw_blk.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 84e9be073180..78c6b312bd30 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -43,8 +43,8 @@ static int cfq_slice_idle = HZ / 125; | |||
43 | #define RQ_CIC(rq) ((struct cfq_io_context*)(rq)->elevator_private) | 43 | #define RQ_CIC(rq) ((struct cfq_io_context*)(rq)->elevator_private) |
44 | #define RQ_CFQQ(rq) ((rq)->elevator_private2) | 44 | #define RQ_CFQQ(rq) ((rq)->elevator_private2) |
45 | 45 | ||
46 | static kmem_cache_t *cfq_pool; | 46 | static struct kmem_cache *cfq_pool; |
47 | static kmem_cache_t *cfq_ioc_pool; | 47 | static struct kmem_cache *cfq_ioc_pool; |
48 | 48 | ||
49 | static DEFINE_PER_CPU(unsigned long, ioc_count); | 49 | static DEFINE_PER_CPU(unsigned long, ioc_count); |
50 | static struct completion *ioc_gone; | 50 | static struct completion *ioc_gone; |
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index cc6e95f8e5d9..a4ff3271d4a8 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -44,17 +44,17 @@ static struct io_context *current_io_context(gfp_t gfp_flags, int node); | |||
44 | /* | 44 | /* |
45 | * For the allocated request tables | 45 | * For the allocated request tables |
46 | */ | 46 | */ |
47 | static kmem_cache_t *request_cachep; | 47 | static struct kmem_cache *request_cachep; |
48 | 48 | ||
49 | /* | 49 | /* |
50 | * For queue allocation | 50 | * For queue allocation |
51 | */ | 51 | */ |
52 | static kmem_cache_t *requestq_cachep; | 52 | static struct kmem_cache *requestq_cachep; |
53 | 53 | ||
54 | /* | 54 | /* |
55 | * For io context allocations | 55 | * For io context allocations |
56 | */ | 56 | */ |
57 | static kmem_cache_t *iocontext_cachep; | 57 | static struct kmem_cache *iocontext_cachep; |
58 | 58 | ||
59 | /* | 59 | /* |
60 | * Controlling structure to kblockd | 60 | * Controlling structure to kblockd |