diff options
author | NeilBrown <neilb@suse.de> | 2011-10-11 01:48:49 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2011-10-11 01:48:49 -0400 |
commit | a71207713a36e73fb1bc264453a9c594b95d3af1 (patch) | |
tree | 5b7fbeae4af391fd52f870af0128e49b1e671975 /drivers/md/linear.c | |
parent | 0f6d02d580ca77ee4be085c29c5fe5b879df24d9 (diff) |
md/linear: remove typedefs: dev_info_t -> struct dev_info
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/linear.c')
-rw-r--r-- | drivers/md/linear.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index 2e176e020ab5..e9159ebcaaef 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(struct mddev *mddev, sector_t sector) | 29 | static inline struct dev_info *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; |
@@ -64,7 +64,7 @@ static int linear_mergeable_bvec(struct request_queue *q, | |||
64 | struct bio_vec *biovec) | 64 | struct bio_vec *biovec) |
65 | { | 65 | { |
66 | struct mddev *mddev = q->queuedata; | 66 | struct mddev *mddev = q->queuedata; |
67 | dev_info_t *dev0; | 67 | struct dev_info *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); |
70 | 70 | ||
@@ -129,7 +129,7 @@ static linear_conf_t *linear_conf(struct mddev *mddev, int raid_disks) | |||
129 | struct md_rdev *rdev; | 129 | struct md_rdev *rdev; |
130 | int i, cnt; | 130 | int i, cnt; |
131 | 131 | ||
132 | conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(dev_info_t), | 132 | conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(struct dev_info), |
133 | GFP_KERNEL); | 133 | GFP_KERNEL); |
134 | if (!conf) | 134 | if (!conf) |
135 | return NULL; | 135 | return NULL; |
@@ -139,7 +139,7 @@ static linear_conf_t *linear_conf(struct mddev *mddev, int raid_disks) | |||
139 | 139 | ||
140 | list_for_each_entry(rdev, &mddev->disks, same_set) { | 140 | list_for_each_entry(rdev, &mddev->disks, same_set) { |
141 | int j = rdev->raid_disk; | 141 | int j = rdev->raid_disk; |
142 | dev_info_t *disk = conf->disks + j; | 142 | struct dev_info *disk = conf->disks + j; |
143 | sector_t sectors; | 143 | sector_t sectors; |
144 | 144 | ||
145 | if (j < 0 || j >= raid_disks || disk->rdev) { | 145 | if (j < 0 || j >= raid_disks || disk->rdev) { |
@@ -266,7 +266,7 @@ static int linear_stop (struct mddev *mddev) | |||
266 | 266 | ||
267 | static int linear_make_request (struct mddev *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 | struct dev_info *tmp_dev; |
270 | sector_t start_sector; | 270 | sector_t start_sector; |
271 | 271 | ||
272 | if (unlikely(bio->bi_rw & REQ_FLUSH)) { | 272 | if (unlikely(bio->bi_rw & REQ_FLUSH)) { |