Loading drivers/md/linear.c +8 −8 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ static inline struct dev_info *which_dev(struct mddev *mddev, sector_t sector) { int lo, mid, hi; linear_conf_t *conf; struct linear_conf *conf; lo = 0; hi = mddev->raid_disks - 1; Loading Loading @@ -90,7 +90,7 @@ static int linear_mergeable_bvec(struct request_queue *q, static int linear_congested(void *data, int bits) { struct mddev *mddev = data; linear_conf_t *conf; struct linear_conf *conf; int i, ret = 0; if (mddev_congested(mddev, bits)) Loading @@ -110,7 +110,7 @@ static int linear_congested(void *data, int bits) static sector_t linear_size(struct mddev *mddev, sector_t sectors, int raid_disks) { linear_conf_t *conf; struct linear_conf *conf; sector_t array_sectors; rcu_read_lock(); Loading @@ -123,9 +123,9 @@ static sector_t linear_size(struct mddev *mddev, sector_t sectors, int raid_disk return array_sectors; } static linear_conf_t *linear_conf(struct mddev *mddev, int raid_disks) static struct linear_conf *linear_conf(struct mddev *mddev, int raid_disks) { linear_conf_t *conf; struct linear_conf *conf; struct md_rdev *rdev; int i, cnt; Loading Loading @@ -196,7 +196,7 @@ out: static int linear_run (struct mddev *mddev) { linear_conf_t *conf; struct linear_conf *conf; if (md_check_no_bitmap(mddev)) return -EINVAL; Loading @@ -223,7 +223,7 @@ static int linear_add(struct mddev *mddev, struct md_rdev *rdev) * The current one is never freed until the array is stopped. * This avoids races. */ linear_conf_t *newconf, *oldconf; struct linear_conf *newconf, *oldconf; if (rdev->saved_raid_disk != mddev->raid_disks) return -EINVAL; Loading @@ -247,7 +247,7 @@ static int linear_add(struct mddev *mddev, struct md_rdev *rdev) static int linear_stop (struct mddev *mddev) { linear_conf_t *conf = mddev->private; struct linear_conf *conf = mddev->private; /* * We do not require rcu protection here since Loading drivers/md/linear.h +1 −5 Original line number Diff line number Diff line Loading @@ -6,14 +6,10 @@ struct dev_info { sector_t end_sector; }; struct linear_private_data struct linear_conf { struct rcu_head rcu; sector_t array_sectors; struct dev_info disks[0]; }; typedef struct linear_private_data linear_conf_t; #endif Loading
drivers/md/linear.c +8 −8 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ static inline struct dev_info *which_dev(struct mddev *mddev, sector_t sector) { int lo, mid, hi; linear_conf_t *conf; struct linear_conf *conf; lo = 0; hi = mddev->raid_disks - 1; Loading Loading @@ -90,7 +90,7 @@ static int linear_mergeable_bvec(struct request_queue *q, static int linear_congested(void *data, int bits) { struct mddev *mddev = data; linear_conf_t *conf; struct linear_conf *conf; int i, ret = 0; if (mddev_congested(mddev, bits)) Loading @@ -110,7 +110,7 @@ static int linear_congested(void *data, int bits) static sector_t linear_size(struct mddev *mddev, sector_t sectors, int raid_disks) { linear_conf_t *conf; struct linear_conf *conf; sector_t array_sectors; rcu_read_lock(); Loading @@ -123,9 +123,9 @@ static sector_t linear_size(struct mddev *mddev, sector_t sectors, int raid_disk return array_sectors; } static linear_conf_t *linear_conf(struct mddev *mddev, int raid_disks) static struct linear_conf *linear_conf(struct mddev *mddev, int raid_disks) { linear_conf_t *conf; struct linear_conf *conf; struct md_rdev *rdev; int i, cnt; Loading Loading @@ -196,7 +196,7 @@ out: static int linear_run (struct mddev *mddev) { linear_conf_t *conf; struct linear_conf *conf; if (md_check_no_bitmap(mddev)) return -EINVAL; Loading @@ -223,7 +223,7 @@ static int linear_add(struct mddev *mddev, struct md_rdev *rdev) * The current one is never freed until the array is stopped. * This avoids races. */ linear_conf_t *newconf, *oldconf; struct linear_conf *newconf, *oldconf; if (rdev->saved_raid_disk != mddev->raid_disks) return -EINVAL; Loading @@ -247,7 +247,7 @@ static int linear_add(struct mddev *mddev, struct md_rdev *rdev) static int linear_stop (struct mddev *mddev) { linear_conf_t *conf = mddev->private; struct linear_conf *conf = mddev->private; /* * We do not require rcu protection here since Loading
drivers/md/linear.h +1 −5 Original line number Diff line number Diff line Loading @@ -6,14 +6,10 @@ struct dev_info { sector_t end_sector; }; struct linear_private_data struct linear_conf { struct rcu_head rcu; sector_t array_sectors; struct dev_info disks[0]; }; typedef struct linear_private_data linear_conf_t; #endif