Skip to content

Commit

Permalink
md/linear: typedef removal: linear_conf_t -> struct linear_conf
Browse files Browse the repository at this point in the history
Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
NeilBrown committed Oct 11, 2011
1 parent 8f1ae43 commit e849b93
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
16 changes: 8 additions & 8 deletions drivers/md/linear.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))
Expand All @@ -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();
Expand All @@ -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;

Expand Down Expand Up @@ -196,7 +196,7 @@ static linear_conf_t *linear_conf(struct mddev *mddev, int raid_disks)

static int linear_run (struct mddev *mddev)
{
linear_conf_t *conf;
struct linear_conf *conf;

if (md_check_no_bitmap(mddev))
return -EINVAL;
Expand All @@ -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;
Expand All @@ -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
Expand Down
6 changes: 1 addition & 5 deletions drivers/md/linear.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e849b93

Please sign in to comment.