aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-10-11 16:48:54 +1100
committerNeilBrown <neilb@suse.de>2011-10-11 16:48:54 +1100
commite849b9381f726c0fa20c4e7b7139b936df777084 (patch)
tree8f1a8b8cf0afb7621c9025fb6ead7d8e9f319b95
parent8f1ae43dd27eff2d71708be46fad339dbdd70bd1 (diff)
md/linear: typedef removal: linear_conf_t -> struct linear_conf
Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--drivers/md/linear.c16
-rw-r--r--drivers/md/linear.h6
2 files changed, 9 insertions, 13 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index e9159ebcaae..cbac48cfe72 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -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;
@@ -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))
@@ -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();
@@ -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;
@@ -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;
@@ -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;
@@ -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
diff --git a/drivers/md/linear.h b/drivers/md/linear.h
index 4d0cf3c7cd4..b685ddd7d7f 100644
--- a/drivers/md/linear.h
+++ b/drivers/md/linear.h
@@ -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