diff options
Diffstat (limited to 'drivers/md/linear.c')
-rw-r--r-- | drivers/md/linear.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index 0b5cac0fda1a..2e176e020ab5 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c | |||
@@ -26,7 +26,7 @@ | |||
26 | /* | 26 | /* |
27 | * find which device holds a particular offset | 27 | * find which device holds a particular offset |
28 | */ | 28 | */ |
29 | static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector) | 29 | static inline dev_info_t *which_dev(struct mddev *mddev, sector_t sector) |
30 | { | 30 | { |
31 | int lo, mid, hi; | 31 | int lo, mid, hi; |
32 | linear_conf_t *conf; | 32 | linear_conf_t *conf; |
@@ -63,7 +63,7 @@ static int linear_mergeable_bvec(struct request_queue *q, | |||
63 | struct bvec_merge_data *bvm, | 63 | struct bvec_merge_data *bvm, |
64 | struct bio_vec *biovec) | 64 | struct bio_vec *biovec) |
65 | { | 65 | { |
66 | mddev_t *mddev = q->queuedata; | 66 | struct mddev *mddev = q->queuedata; |
67 | dev_info_t *dev0; | 67 | dev_info_t *dev0; |
68 | unsigned long maxsectors, bio_sectors = bvm->bi_size >> 9; | 68 | unsigned long maxsectors, bio_sectors = bvm->bi_size >> 9; |
69 | sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev); | 69 | sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev); |
@@ -89,7 +89,7 @@ static int linear_mergeable_bvec(struct request_queue *q, | |||
89 | 89 | ||
90 | static int linear_congested(void *data, int bits) | 90 | static int linear_congested(void *data, int bits) |
91 | { | 91 | { |
92 | mddev_t *mddev = data; | 92 | struct mddev *mddev = data; |
93 | linear_conf_t *conf; | 93 | linear_conf_t *conf; |
94 | int i, ret = 0; | 94 | int i, ret = 0; |
95 | 95 | ||
@@ -108,7 +108,7 @@ static int linear_congested(void *data, int bits) | |||
108 | return ret; | 108 | return ret; |
109 | } | 109 | } |
110 | 110 | ||
111 | static sector_t linear_size(mddev_t *mddev, sector_t sectors, int raid_disks) | 111 | static sector_t linear_size(struct mddev *mddev, sector_t sectors, int raid_disks) |
112 | { | 112 | { |
113 | linear_conf_t *conf; | 113 | linear_conf_t *conf; |
114 | sector_t array_sectors; | 114 | sector_t array_sectors; |
@@ -123,7 +123,7 @@ static sector_t linear_size(mddev_t *mddev, sector_t sectors, int raid_disks) | |||
123 | return array_sectors; | 123 | return array_sectors; |
124 | } | 124 | } |
125 | 125 | ||
126 | static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) | 126 | static linear_conf_t *linear_conf(struct mddev *mddev, int raid_disks) |
127 | { | 127 | { |
128 | linear_conf_t *conf; | 128 | linear_conf_t *conf; |
129 | struct md_rdev *rdev; | 129 | struct md_rdev *rdev; |
@@ -194,7 +194,7 @@ out: | |||
194 | return NULL; | 194 | return NULL; |
195 | } | 195 | } |
196 | 196 | ||
197 | static int linear_run (mddev_t *mddev) | 197 | static int linear_run (struct mddev *mddev) |
198 | { | 198 | { |
199 | linear_conf_t *conf; | 199 | linear_conf_t *conf; |
200 | 200 | ||
@@ -213,7 +213,7 @@ static int linear_run (mddev_t *mddev) | |||
213 | return md_integrity_register(mddev); | 213 | return md_integrity_register(mddev); |
214 | } | 214 | } |
215 | 215 | ||
216 | static int linear_add(mddev_t *mddev, struct md_rdev *rdev) | 216 | static int linear_add(struct mddev *mddev, struct md_rdev *rdev) |
217 | { | 217 | { |
218 | /* Adding a drive to a linear array allows the array to grow. | 218 | /* Adding a drive to a linear array allows the array to grow. |
219 | * It is permitted if the new drive has a matching superblock | 219 | * It is permitted if the new drive has a matching superblock |
@@ -245,7 +245,7 @@ static int linear_add(mddev_t *mddev, struct md_rdev *rdev) | |||
245 | return 0; | 245 | return 0; |
246 | } | 246 | } |
247 | 247 | ||
248 | static int linear_stop (mddev_t *mddev) | 248 | static int linear_stop (struct mddev *mddev) |
249 | { | 249 | { |
250 | linear_conf_t *conf = mddev->private; | 250 | linear_conf_t *conf = mddev->private; |
251 | 251 | ||
@@ -264,7 +264,7 @@ static int linear_stop (mddev_t *mddev) | |||
264 | return 0; | 264 | return 0; |
265 | } | 265 | } |
266 | 266 | ||
267 | static int linear_make_request (mddev_t *mddev, struct bio *bio) | 267 | static int linear_make_request (struct mddev *mddev, struct bio *bio) |
268 | { | 268 | { |
269 | dev_info_t *tmp_dev; | 269 | dev_info_t *tmp_dev; |
270 | sector_t start_sector; | 270 | sector_t start_sector; |
@@ -323,7 +323,7 @@ static int linear_make_request (mddev_t *mddev, struct bio *bio) | |||
323 | return 1; | 323 | return 1; |
324 | } | 324 | } |
325 | 325 | ||
326 | static void linear_status (struct seq_file *seq, mddev_t *mddev) | 326 | static void linear_status (struct seq_file *seq, struct mddev *mddev) |
327 | { | 327 | { |
328 | 328 | ||
329 | seq_printf(seq, " %dk rounding", mddev->chunk_sectors / 2); | 329 | seq_printf(seq, " %dk rounding", mddev->chunk_sectors / 2); |