Commit e849b9381f726c0fa20c4e7b7139b936df777084
1 parent
8f1ae43dd2
Exists in
master
and in
6 other branches
md/linear: typedef removal: linear_conf_t -> struct linear_conf
Signed-off-by: NeilBrown <neilb@suse.de>
Showing 2 changed files with 9 additions and 13 deletions Side-by-side Diff
drivers/md/linear.c
| ... | ... | @@ -29,7 +29,7 @@ |
| 29 | 29 | static inline struct dev_info *which_dev(struct mddev *mddev, sector_t sector) |
| 30 | 30 | { |
| 31 | 31 | int lo, mid, hi; |
| 32 | - linear_conf_t *conf; | |
| 32 | + struct linear_conf *conf; | |
| 33 | 33 | |
| 34 | 34 | lo = 0; |
| 35 | 35 | hi = mddev->raid_disks - 1; |
| ... | ... | @@ -90,7 +90,7 @@ |
| 90 | 90 | static int linear_congested(void *data, int bits) |
| 91 | 91 | { |
| 92 | 92 | struct mddev *mddev = data; |
| 93 | - linear_conf_t *conf; | |
| 93 | + struct linear_conf *conf; | |
| 94 | 94 | int i, ret = 0; |
| 95 | 95 | |
| 96 | 96 | if (mddev_congested(mddev, bits)) |
| ... | ... | @@ -110,7 +110,7 @@ |
| 110 | 110 | |
| 111 | 111 | static sector_t linear_size(struct mddev *mddev, sector_t sectors, int raid_disks) |
| 112 | 112 | { |
| 113 | - linear_conf_t *conf; | |
| 113 | + struct linear_conf *conf; | |
| 114 | 114 | sector_t array_sectors; |
| 115 | 115 | |
| 116 | 116 | rcu_read_lock(); |
| 117 | 117 | |
| ... | ... | @@ -123,9 +123,9 @@ |
| 123 | 123 | return array_sectors; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | -static linear_conf_t *linear_conf(struct mddev *mddev, int raid_disks) | |
| 126 | +static struct linear_conf *linear_conf(struct mddev *mddev, int raid_disks) | |
| 127 | 127 | { |
| 128 | - linear_conf_t *conf; | |
| 128 | + struct linear_conf *conf; | |
| 129 | 129 | struct md_rdev *rdev; |
| 130 | 130 | int i, cnt; |
| 131 | 131 | |
| ... | ... | @@ -196,7 +196,7 @@ |
| 196 | 196 | |
| 197 | 197 | static int linear_run (struct mddev *mddev) |
| 198 | 198 | { |
| 199 | - linear_conf_t *conf; | |
| 199 | + struct linear_conf *conf; | |
| 200 | 200 | |
| 201 | 201 | if (md_check_no_bitmap(mddev)) |
| 202 | 202 | return -EINVAL; |
| ... | ... | @@ -223,7 +223,7 @@ |
| 223 | 223 | * The current one is never freed until the array is stopped. |
| 224 | 224 | * This avoids races. |
| 225 | 225 | */ |
| 226 | - linear_conf_t *newconf, *oldconf; | |
| 226 | + struct linear_conf *newconf, *oldconf; | |
| 227 | 227 | |
| 228 | 228 | if (rdev->saved_raid_disk != mddev->raid_disks) |
| 229 | 229 | return -EINVAL; |
| ... | ... | @@ -247,7 +247,7 @@ |
| 247 | 247 | |
| 248 | 248 | static int linear_stop (struct mddev *mddev) |
| 249 | 249 | { |
| 250 | - linear_conf_t *conf = mddev->private; | |
| 250 | + struct linear_conf *conf = mddev->private; | |
| 251 | 251 | |
| 252 | 252 | /* |
| 253 | 253 | * We do not require rcu protection here since |
drivers/md/linear.h
| ... | ... | @@ -6,15 +6,11 @@ |
| 6 | 6 | sector_t end_sector; |
| 7 | 7 | }; |
| 8 | 8 | |
| 9 | -struct linear_private_data | |
| 9 | +struct linear_conf | |
| 10 | 10 | { |
| 11 | 11 | struct rcu_head rcu; |
| 12 | 12 | sector_t array_sectors; |
| 13 | 13 | struct dev_info disks[0]; |
| 14 | 14 | }; |
| 15 | - | |
| 16 | - | |
| 17 | -typedef struct linear_private_data linear_conf_t; | |
| 18 | - | |
| 19 | 15 | #endif |