diff options
author | NeilBrown <neilb@suse.de> | 2011-10-11 01:47:53 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2011-10-11 01:47:53 -0400 |
commit | fd01b88c75a718020ff77e7f560d33835e9b58de (patch) | |
tree | c455d5adefd58f3263dcf265bb8ba2024523b106 /drivers/md/multipath.c | |
parent | 3cb03002000f133f9f97269edefd73611eafc873 (diff) |
md: remove typedefs: mddev_t -> struct mddev
Having mddev_t and 'struct mddev_s' is ugly and not preferred
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/multipath.c')
-rw-r--r-- | drivers/md/multipath.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 09e8aa3d59f9..9c8d4b664312 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c | |||
@@ -58,7 +58,7 @@ static int multipath_map (multipath_conf_t *conf) | |||
58 | static void multipath_reschedule_retry (struct multipath_bh *mp_bh) | 58 | static void multipath_reschedule_retry (struct multipath_bh *mp_bh) |
59 | { | 59 | { |
60 | unsigned long flags; | 60 | unsigned long flags; |
61 | mddev_t *mddev = mp_bh->mddev; | 61 | struct mddev *mddev = mp_bh->mddev; |
62 | multipath_conf_t *conf = mddev->private; | 62 | multipath_conf_t *conf = mddev->private; |
63 | 63 | ||
64 | spin_lock_irqsave(&conf->device_lock, flags); | 64 | spin_lock_irqsave(&conf->device_lock, flags); |
@@ -106,7 +106,7 @@ static void multipath_end_request(struct bio *bio, int error) | |||
106 | rdev_dec_pending(rdev, conf->mddev); | 106 | rdev_dec_pending(rdev, conf->mddev); |
107 | } | 107 | } |
108 | 108 | ||
109 | static int multipath_make_request(mddev_t *mddev, struct bio * bio) | 109 | static int multipath_make_request(struct mddev *mddev, struct bio * bio) |
110 | { | 110 | { |
111 | multipath_conf_t *conf = mddev->private; | 111 | multipath_conf_t *conf = mddev->private; |
112 | struct multipath_bh * mp_bh; | 112 | struct multipath_bh * mp_bh; |
@@ -140,7 +140,7 @@ static int multipath_make_request(mddev_t *mddev, struct bio * bio) | |||
140 | return 0; | 140 | return 0; |
141 | } | 141 | } |
142 | 142 | ||
143 | static void multipath_status (struct seq_file *seq, mddev_t *mddev) | 143 | static void multipath_status (struct seq_file *seq, struct mddev *mddev) |
144 | { | 144 | { |
145 | multipath_conf_t *conf = mddev->private; | 145 | multipath_conf_t *conf = mddev->private; |
146 | int i; | 146 | int i; |
@@ -156,7 +156,7 @@ static void multipath_status (struct seq_file *seq, mddev_t *mddev) | |||
156 | 156 | ||
157 | static int multipath_congested(void *data, int bits) | 157 | static int multipath_congested(void *data, int bits) |
158 | { | 158 | { |
159 | mddev_t *mddev = data; | 159 | struct mddev *mddev = data; |
160 | multipath_conf_t *conf = mddev->private; | 160 | multipath_conf_t *conf = mddev->private; |
161 | int i, ret = 0; | 161 | int i, ret = 0; |
162 | 162 | ||
@@ -183,7 +183,7 @@ static int multipath_congested(void *data, int bits) | |||
183 | /* | 183 | /* |
184 | * Careful, this can execute in IRQ contexts as well! | 184 | * Careful, this can execute in IRQ contexts as well! |
185 | */ | 185 | */ |
186 | static void multipath_error (mddev_t *mddev, struct md_rdev *rdev) | 186 | static void multipath_error (struct mddev *mddev, struct md_rdev *rdev) |
187 | { | 187 | { |
188 | multipath_conf_t *conf = mddev->private; | 188 | multipath_conf_t *conf = mddev->private; |
189 | char b[BDEVNAME_SIZE]; | 189 | char b[BDEVNAME_SIZE]; |
@@ -242,7 +242,7 @@ static void print_multipath_conf (multipath_conf_t *conf) | |||
242 | } | 242 | } |
243 | 243 | ||
244 | 244 | ||
245 | static int multipath_add_disk(mddev_t *mddev, struct md_rdev *rdev) | 245 | static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev) |
246 | { | 246 | { |
247 | multipath_conf_t *conf = mddev->private; | 247 | multipath_conf_t *conf = mddev->private; |
248 | struct request_queue *q; | 248 | struct request_queue *q; |
@@ -291,7 +291,7 @@ static int multipath_add_disk(mddev_t *mddev, struct md_rdev *rdev) | |||
291 | return err; | 291 | return err; |
292 | } | 292 | } |
293 | 293 | ||
294 | static int multipath_remove_disk(mddev_t *mddev, int number) | 294 | static int multipath_remove_disk(struct mddev *mddev, int number) |
295 | { | 295 | { |
296 | multipath_conf_t *conf = mddev->private; | 296 | multipath_conf_t *conf = mddev->private; |
297 | int err = 0; | 297 | int err = 0; |
@@ -335,7 +335,7 @@ abort: | |||
335 | * 3. Performs writes following reads for array syncronising. | 335 | * 3. Performs writes following reads for array syncronising. |
336 | */ | 336 | */ |
337 | 337 | ||
338 | static void multipathd (mddev_t *mddev) | 338 | static void multipathd (struct mddev *mddev) |
339 | { | 339 | { |
340 | struct multipath_bh *mp_bh; | 340 | struct multipath_bh *mp_bh; |
341 | struct bio *bio; | 341 | struct bio *bio; |
@@ -379,7 +379,7 @@ static void multipathd (mddev_t *mddev) | |||
379 | spin_unlock_irqrestore(&conf->device_lock, flags); | 379 | spin_unlock_irqrestore(&conf->device_lock, flags); |
380 | } | 380 | } |
381 | 381 | ||
382 | static sector_t multipath_size(mddev_t *mddev, sector_t sectors, int raid_disks) | 382 | static sector_t multipath_size(struct mddev *mddev, sector_t sectors, int raid_disks) |
383 | { | 383 | { |
384 | WARN_ONCE(sectors || raid_disks, | 384 | WARN_ONCE(sectors || raid_disks, |
385 | "%s does not support generic reshape\n", __func__); | 385 | "%s does not support generic reshape\n", __func__); |
@@ -387,7 +387,7 @@ static sector_t multipath_size(mddev_t *mddev, sector_t sectors, int raid_disks) | |||
387 | return mddev->dev_sectors; | 387 | return mddev->dev_sectors; |
388 | } | 388 | } |
389 | 389 | ||
390 | static int multipath_run (mddev_t *mddev) | 390 | static int multipath_run (struct mddev *mddev) |
391 | { | 391 | { |
392 | multipath_conf_t *conf; | 392 | multipath_conf_t *conf; |
393 | int disk_idx; | 393 | int disk_idx; |
@@ -510,7 +510,7 @@ out: | |||
510 | } | 510 | } |
511 | 511 | ||
512 | 512 | ||
513 | static int multipath_stop (mddev_t *mddev) | 513 | static int multipath_stop (struct mddev *mddev) |
514 | { | 514 | { |
515 | multipath_conf_t *conf = mddev->private; | 515 | multipath_conf_t *conf = mddev->private; |
516 | 516 | ||