diff options
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/dm-crypt.c | 2 | ||||
-rw-r--r-- | drivers/md/dm-mpath.c | 2 | ||||
-rw-r--r-- | drivers/md/dm-snap.c | 6 | ||||
-rw-r--r-- | drivers/md/dm.c | 4 | ||||
-rw-r--r-- | drivers/md/kcopyd.c | 2 | ||||
-rw-r--r-- | drivers/md/raid5.c | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index ed2d4ef27fd8..c7bee4f2eedb 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
@@ -101,7 +101,7 @@ struct crypt_config { | |||
101 | #define MIN_POOL_PAGES 32 | 101 | #define MIN_POOL_PAGES 32 |
102 | #define MIN_BIO_PAGES 8 | 102 | #define MIN_BIO_PAGES 8 |
103 | 103 | ||
104 | static kmem_cache_t *_crypt_io_pool; | 104 | static struct kmem_cache *_crypt_io_pool; |
105 | 105 | ||
106 | /* | 106 | /* |
107 | * Different IV generation algorithms: | 107 | * Different IV generation algorithms: |
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index e77ee6fd1044..cf8bf052138e 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c | |||
@@ -101,7 +101,7 @@ typedef int (*action_fn) (struct pgpath *pgpath); | |||
101 | 101 | ||
102 | #define MIN_IOS 256 /* Mempool size */ | 102 | #define MIN_IOS 256 /* Mempool size */ |
103 | 103 | ||
104 | static kmem_cache_t *_mpio_cache; | 104 | static struct kmem_cache *_mpio_cache; |
105 | 105 | ||
106 | struct workqueue_struct *kmultipathd; | 106 | struct workqueue_struct *kmultipathd; |
107 | static void process_queued_ios(struct work_struct *work); | 107 | static void process_queued_ios(struct work_struct *work); |
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index 91c7aa1fed0e..b0ce2ce82278 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c | |||
@@ -88,8 +88,8 @@ struct pending_exception { | |||
88 | * Hash table mapping origin volumes to lists of snapshots and | 88 | * Hash table mapping origin volumes to lists of snapshots and |
89 | * a lock to protect it | 89 | * a lock to protect it |
90 | */ | 90 | */ |
91 | static kmem_cache_t *exception_cache; | 91 | static struct kmem_cache *exception_cache; |
92 | static kmem_cache_t *pending_cache; | 92 | static struct kmem_cache *pending_cache; |
93 | static mempool_t *pending_pool; | 93 | static mempool_t *pending_pool; |
94 | 94 | ||
95 | /* | 95 | /* |
@@ -228,7 +228,7 @@ static int init_exception_table(struct exception_table *et, uint32_t size) | |||
228 | return 0; | 228 | return 0; |
229 | } | 229 | } |
230 | 230 | ||
231 | static void exit_exception_table(struct exception_table *et, kmem_cache_t *mem) | 231 | static void exit_exception_table(struct exception_table *et, struct kmem_cache *mem) |
232 | { | 232 | { |
233 | struct list_head *slot; | 233 | struct list_head *slot; |
234 | struct exception *ex, *next; | 234 | struct exception *ex, *next; |
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index fc4f743f3b53..7ec1b112a6d5 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
@@ -121,8 +121,8 @@ struct mapped_device { | |||
121 | }; | 121 | }; |
122 | 122 | ||
123 | #define MIN_IOS 256 | 123 | #define MIN_IOS 256 |
124 | static kmem_cache_t *_io_cache; | 124 | static struct kmem_cache *_io_cache; |
125 | static kmem_cache_t *_tio_cache; | 125 | static struct kmem_cache *_tio_cache; |
126 | 126 | ||
127 | static int __init local_init(void) | 127 | static int __init local_init(void) |
128 | { | 128 | { |
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c index b3c01496c737..b46f6c575f7e 100644 --- a/drivers/md/kcopyd.c +++ b/drivers/md/kcopyd.c | |||
@@ -203,7 +203,7 @@ struct kcopyd_job { | |||
203 | /* FIXME: this should scale with the number of pages */ | 203 | /* FIXME: this should scale with the number of pages */ |
204 | #define MIN_JOBS 512 | 204 | #define MIN_JOBS 512 |
205 | 205 | ||
206 | static kmem_cache_t *_job_cache; | 206 | static struct kmem_cache *_job_cache; |
207 | static mempool_t *_job_pool; | 207 | static mempool_t *_job_pool; |
208 | 208 | ||
209 | /* | 209 | /* |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 69c3e201fa3b..52914d5cec76 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -348,7 +348,7 @@ static int grow_one_stripe(raid5_conf_t *conf) | |||
348 | 348 | ||
349 | static int grow_stripes(raid5_conf_t *conf, int num) | 349 | static int grow_stripes(raid5_conf_t *conf, int num) |
350 | { | 350 | { |
351 | kmem_cache_t *sc; | 351 | struct kmem_cache *sc; |
352 | int devs = conf->raid_disks; | 352 | int devs = conf->raid_disks; |
353 | 353 | ||
354 | sprintf(conf->cache_name[0], "raid5/%s", mdname(conf->mddev)); | 354 | sprintf(conf->cache_name[0], "raid5/%s", mdname(conf->mddev)); |
@@ -397,7 +397,7 @@ static int resize_stripes(raid5_conf_t *conf, int newsize) | |||
397 | LIST_HEAD(newstripes); | 397 | LIST_HEAD(newstripes); |
398 | struct disk_info *ndisks; | 398 | struct disk_info *ndisks; |
399 | int err = 0; | 399 | int err = 0; |
400 | kmem_cache_t *sc; | 400 | struct kmem_cache *sc; |
401 | int i; | 401 | int i; |
402 | 402 | ||
403 | if (newsize <= conf->pool_size) | 403 | if (newsize <= conf->pool_size) |