Commit fd01b88c authored by NeilBrown's avatar NeilBrown
Browse files

md: remove typedefs: mddev_t -> struct mddev 



Having mddev_t and 'struct mddev_s' is ugly and not preferred

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 3cb03002

drivers/md/bitmap.c

+22 −22
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page) 
 */



/* IO operations when bitmap is stored near all superblocks */

static struct page *read_sb_page(mddev_t *mddev, loff_t offset,

static struct page *read_sb_page(struct mddev *mddev, loff_t offset,

				 struct page *page,

				 unsigned long index, int size)

{
@@ -218,7 +218,7 @@ static struct page *read_sb_page(mddev_t *mddev, loff_t offset, 


}



static struct md_rdev *next_active_rdev(struct md_rdev *rdev, mddev_t *mddev)

static struct md_rdev *next_active_rdev(struct md_rdev *rdev, struct mddev *mddev)

{

	/* Iterate the disks of an mddev, using rcu to protect access to the

	 * linked list, and raising the refcount of devices we return to ensure
@@ -256,7 +256,7 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait) 
{

	struct md_rdev *rdev = NULL;

	struct block_device *bdev;

	mddev_t *mddev = bitmap->mddev;

	struct mddev *mddev = bitmap->mddev;



	while ((rdev = next_active_rdev(rdev, mddev)) != NULL) {

		int size = PAGE_SIZE;
@@ -1157,7 +1157,7 @@ static bitmap_counter_t *bitmap_get_counter(struct bitmap *bitmap, 
 *			out to disk

 */



void bitmap_daemon_work(mddev_t *mddev)

void bitmap_daemon_work(struct mddev *mddev)

{

	struct bitmap *bitmap;

	unsigned long j;
@@ -1647,7 +1647,7 @@ void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e) 
/*

 * flush out any pending updates

 */

void bitmap_flush(mddev_t *mddev)

void bitmap_flush(struct mddev *mddev)

{

	struct bitmap *bitmap = mddev->bitmap;

	long sleep;
@@ -1695,7 +1695,7 @@ static void bitmap_free(struct bitmap *bitmap) 
	kfree(bitmap);

}



void bitmap_destroy(mddev_t *mddev)

void bitmap_destroy(struct mddev *mddev)

{

	struct bitmap *bitmap = mddev->bitmap;
@@ -1718,7 +1718,7 @@ void bitmap_destroy(mddev_t *mddev) 
 * initialize the bitmap structure

 * if this returns an error, bitmap_destroy must be called to do clean up

 */

int bitmap_create(mddev_t *mddev)

int bitmap_create(struct mddev *mddev)

{

	struct bitmap *bitmap;

	sector_t blocks = mddev->resync_max_sectors;
@@ -1822,7 +1822,7 @@ int bitmap_create(mddev_t *mddev) 
	return err;

}



int bitmap_load(mddev_t *mddev)

int bitmap_load(struct mddev *mddev)

{

	int err = 0;

	sector_t start = 0;
@@ -1868,7 +1868,7 @@ int bitmap_load(mddev_t *mddev) 
EXPORT_SYMBOL_GPL(bitmap_load);



static ssize_t

location_show(mddev_t *mddev, char *page)

location_show(struct mddev *mddev, char *page)

{

	ssize_t len;

	if (mddev->bitmap_info.file)
@@ -1882,7 +1882,7 @@ location_show(mddev_t *mddev, char *page) 
}



static ssize_t

location_store(mddev_t *mddev, const char *buf, size_t len)

location_store(struct mddev *mddev, const char *buf, size_t len)

{



	if (mddev->pers) {
@@ -1959,7 +1959,7 @@ static struct md_sysfs_entry bitmap_location = 
__ATTR(location, S_IRUGO|S_IWUSR, location_show, location_store);



static ssize_t

timeout_show(mddev_t *mddev, char *page)

timeout_show(struct mddev *mddev, char *page)

{

	ssize_t len;

	unsigned long secs = mddev->bitmap_info.daemon_sleep / HZ;
@@ -1973,7 +1973,7 @@ timeout_show(mddev_t *mddev, char *page) 
}



static ssize_t

timeout_store(mddev_t *mddev, const char *buf, size_t len)

timeout_store(struct mddev *mddev, const char *buf, size_t len)

{

	/* timeout can be set at any time */

	unsigned long timeout;
@@ -2009,13 +2009,13 @@ static struct md_sysfs_entry bitmap_timeout = 
__ATTR(time_base, S_IRUGO|S_IWUSR, timeout_show, timeout_store);



static ssize_t

backlog_show(mddev_t *mddev, char *page)

backlog_show(struct mddev *mddev, char *page)

{

	return sprintf(page, "%lu\n", mddev->bitmap_info.max_write_behind);

}



static ssize_t

backlog_store(mddev_t *mddev, const char *buf, size_t len)

backlog_store(struct mddev *mddev, const char *buf, size_t len)

{

	unsigned long backlog;

	int rv = strict_strtoul(buf, 10, &backlog);
@@ -2031,13 +2031,13 @@ static struct md_sysfs_entry bitmap_backlog = 
__ATTR(backlog, S_IRUGO|S_IWUSR, backlog_show, backlog_store);



static ssize_t

chunksize_show(mddev_t *mddev, char *page)

chunksize_show(struct mddev *mddev, char *page)

{

	return sprintf(page, "%lu\n", mddev->bitmap_info.chunksize);

}



static ssize_t

chunksize_store(mddev_t *mddev, const char *buf, size_t len)

chunksize_store(struct mddev *mddev, const char *buf, size_t len)

{

	/* Can only be changed when no bitmap is active */

	int rv;
@@ -2057,13 +2057,13 @@ chunksize_store(mddev_t *mddev, const char *buf, size_t len) 
static struct md_sysfs_entry bitmap_chunksize =

__ATTR(chunksize, S_IRUGO|S_IWUSR, chunksize_show, chunksize_store);



static ssize_t metadata_show(mddev_t *mddev, char *page)

static ssize_t metadata_show(struct mddev *mddev, char *page)

{

	return sprintf(page, "%s\n", (mddev->bitmap_info.external

				      ? "external" : "internal"));

}



static ssize_t metadata_store(mddev_t *mddev, const char *buf, size_t len)

static ssize_t metadata_store(struct mddev *mddev, const char *buf, size_t len)

{

	if (mddev->bitmap ||

	    mddev->bitmap_info.file ||
@@ -2081,7 +2081,7 @@ static ssize_t metadata_store(mddev_t *mddev, const char *buf, size_t len) 
static struct md_sysfs_entry bitmap_metadata =

__ATTR(metadata, S_IRUGO|S_IWUSR, metadata_show, metadata_store);



static ssize_t can_clear_show(mddev_t *mddev, char *page)

static ssize_t can_clear_show(struct mddev *mddev, char *page)

{

	int len;

	if (mddev->bitmap)
@@ -2092,7 +2092,7 @@ static ssize_t can_clear_show(mddev_t *mddev, char *page) 
	return len;

}



static ssize_t can_clear_store(mddev_t *mddev, const char *buf, size_t len)

static ssize_t can_clear_store(struct mddev *mddev, const char *buf, size_t len)

{

	if (mddev->bitmap == NULL)

		return -ENOENT;
@@ -2111,7 +2111,7 @@ static struct md_sysfs_entry bitmap_can_clear = 
__ATTR(can_clear, S_IRUGO|S_IWUSR, can_clear_show, can_clear_store);



static ssize_t

behind_writes_used_show(mddev_t *mddev, char *page)

behind_writes_used_show(struct mddev *mddev, char *page)

{

	if (mddev->bitmap == NULL)

		return sprintf(page, "0\n");
@@ -2120,7 +2120,7 @@ behind_writes_used_show(mddev_t *mddev, char *page) 
}



static ssize_t

behind_writes_used_reset(mddev_t *mddev, const char *buf, size_t len)

behind_writes_used_reset(struct mddev *mddev, const char *buf, size_t len)

{

	if (mddev->bitmap)

		mddev->bitmap->behind_writes_used = 0;

drivers/md/bitmap.h

+6 −6
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ struct bitmap { 
	unsigned long pages; /* total number of pages in the bitmap */

	unsigned long missing_pages; /* number of pages not yet allocated */



	mddev_t *mddev; /* the md device that the bitmap is for */

	struct mddev *mddev; /* the md device that the bitmap is for */



	/* bitmap chunksize -- how much data does each bit represent? */

	unsigned long chunkshift; /* chunksize = 2^chunkshift (for bitops) */
@@ -238,10 +238,10 @@ struct bitmap { 
/* the bitmap API */



/* these are used only by md/bitmap */

int  bitmap_create(mddev_t *mddev);

int bitmap_load(mddev_t *mddev);

void bitmap_flush(mddev_t *mddev);

void bitmap_destroy(mddev_t *mddev);

int  bitmap_create(struct mddev *mddev);

int bitmap_load(struct mddev *mddev);

void bitmap_flush(struct mddev *mddev);

void bitmap_destroy(struct mddev *mddev);



void bitmap_print_sb(struct bitmap *bitmap);

void bitmap_update_sb(struct bitmap *bitmap);
@@ -262,7 +262,7 @@ void bitmap_close_sync(struct bitmap *bitmap); 
void bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector);



void bitmap_unplug(struct bitmap *bitmap);

void bitmap_daemon_work(mddev_t *mddev);

void bitmap_daemon_work(struct mddev *mddev);

#endif



#endif

drivers/md/dm-raid.c

+6 −6
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct raid_set { 


	uint64_t print_flags;



	struct mddev_s md;

	struct mddev md;

	struct raid_type *raid_type;

	struct dm_target_callbacks callbacks;
@@ -611,7 +611,7 @@ static int read_disk_sb(struct md_rdev *rdev, int size) 
	return 0;

}



static void super_sync(mddev_t *mddev, struct md_rdev *rdev)

static void super_sync(struct mddev *mddev, struct md_rdev *rdev)

{

	struct md_rdev *r, *t;

	uint64_t failed_devices;
@@ -689,7 +689,7 @@ static int super_load(struct md_rdev *rdev, struct md_rdev *refdev) 
	return (events_sb > events_refsb) ? 1 : 0;

}



static int super_init_validation(mddev_t *mddev, struct md_rdev *rdev)

static int super_init_validation(struct mddev *mddev, struct md_rdev *rdev)

{

	int role;

	struct raid_set *rs = container_of(mddev, struct raid_set, md);
@@ -809,7 +809,7 @@ static int super_init_validation(mddev_t *mddev, struct md_rdev *rdev) 
	return 0;

}



static int super_validate(mddev_t *mddev, struct md_rdev *rdev)

static int super_validate(struct mddev *mddev, struct md_rdev *rdev)

{

	struct dm_raid_superblock *sb = page_address(rdev->sb_page);
@@ -850,7 +850,7 @@ static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs) 
{

	int ret;

	struct md_rdev *rdev, *freshest, *tmp;

	mddev_t *mddev = &rs->md;

	struct mddev *mddev = &rs->md;



	freshest = NULL;

	rdev_for_each(rdev, tmp, mddev) {
@@ -1004,7 +1004,7 @@ static void raid_dtr(struct dm_target *ti) 
static int raid_map(struct dm_target *ti, struct bio *bio, union map_info *map_context)

{

	struct raid_set *rs = ti->private;

	mddev_t *mddev = &rs->md;

	struct mddev *mddev = &rs->md;



	mddev->pers->make_request(mddev, bio);

drivers/md/faulty.c

+6 −6
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void add_sector(conf_t *conf, sector_t start, int mode) 
		conf->nfaults = n+1;

}



static int make_request(mddev_t *mddev, struct bio *bio)

static int make_request(struct mddev *mddev, struct bio *bio)

{

	conf_t *conf = mddev->private;

	int failit = 0;
@@ -222,7 +222,7 @@ static int make_request(mddev_t *mddev, struct bio *bio) 
	}

}



static void status(struct seq_file *seq, mddev_t *mddev)

static void status(struct seq_file *seq, struct mddev *mddev)

{

	conf_t *conf = mddev->private;

	int n;
@@ -255,7 +255,7 @@ static void status(struct seq_file *seq, mddev_t *mddev) 
}





static int reshape(mddev_t *mddev)

static int reshape(struct mddev *mddev)

{

	int mode = mddev->new_layout & ModeMask;

	int count = mddev->new_layout >> ModeShift;
@@ -284,7 +284,7 @@ static int reshape(mddev_t *mddev) 
	return 0;

}



static sector_t faulty_size(mddev_t *mddev, sector_t sectors, int raid_disks)

static sector_t faulty_size(struct mddev *mddev, sector_t sectors, int raid_disks)

{

	WARN_ONCE(raid_disks,

		  "%s does not support generic reshape\n", __func__);
@@ -295,7 +295,7 @@ static sector_t faulty_size(mddev_t *mddev, sector_t sectors, int raid_disks) 
	return sectors;

}



static int run(mddev_t *mddev)

static int run(struct mddev *mddev)

{

	struct md_rdev *rdev;

	int i;
@@ -325,7 +325,7 @@ static int run(mddev_t *mddev) 
	return 0;

}



static int stop(mddev_t *mddev)

static int stop(struct mddev *mddev)

{

	conf_t *conf = mddev->private;

drivers/md/linear.c

+10 −10
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
/*

 * find which device holds a particular offset 

 */

static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector)

static inline dev_info_t *which_dev(struct mddev *mddev, sector_t sector)

{

	int lo, mid, hi;

	linear_conf_t *conf;
@@ -63,7 +63,7 @@ static int linear_mergeable_bvec(struct request_queue *q, 
				 struct bvec_merge_data *bvm,

				 struct bio_vec *biovec)

{

	mddev_t *mddev = q->queuedata;

	struct mddev *mddev = q->queuedata;

	dev_info_t *dev0;

	unsigned long maxsectors, bio_sectors = bvm->bi_size >> 9;

	sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
@@ -89,7 +89,7 @@ static int linear_mergeable_bvec(struct request_queue *q, 


static int linear_congested(void *data, int bits)

{

	mddev_t *mddev = data;

	struct mddev *mddev = data;

	linear_conf_t *conf;

	int i, ret = 0;
@@ -108,7 +108,7 @@ static int linear_congested(void *data, int bits) 
	return ret;

}



static sector_t linear_size(mddev_t *mddev, sector_t sectors, int raid_disks)

static sector_t linear_size(struct mddev *mddev, sector_t sectors, int raid_disks)

{

	linear_conf_t *conf;

	sector_t array_sectors;
@@ -123,7 +123,7 @@ static sector_t linear_size(mddev_t *mddev, sector_t sectors, int raid_disks) 
	return array_sectors;

}



static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)

static linear_conf_t *linear_conf(struct mddev *mddev, int raid_disks)

{

	linear_conf_t *conf;

	struct md_rdev *rdev;
@@ -194,7 +194,7 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) 
	return NULL;

}



static int linear_run (mddev_t *mddev)

static int linear_run (struct mddev *mddev)

{

	linear_conf_t *conf;
@@ -213,7 +213,7 @@ static int linear_run (mddev_t *mddev) 
	return md_integrity_register(mddev);

}



static int linear_add(mddev_t *mddev, struct md_rdev *rdev)

static int linear_add(struct mddev *mddev, struct md_rdev *rdev)

{

	/* Adding a drive to a linear array allows the array to grow.

	 * It is permitted if the new drive has a matching superblock
@@ -245,7 +245,7 @@ static int linear_add(mddev_t *mddev, struct md_rdev *rdev) 
	return 0;

}



static int linear_stop (mddev_t *mddev)

static int linear_stop (struct mddev *mddev)

{

	linear_conf_t *conf = mddev->private;
@@ -264,7 +264,7 @@ static int linear_stop (mddev_t *mddev) 
	return 0;

}



static int linear_make_request (mddev_t *mddev, struct bio *bio)

static int linear_make_request (struct mddev *mddev, struct bio *bio)

{

	dev_info_t *tmp_dev;

	sector_t start_sector;
@@ -323,7 +323,7 @@ static int linear_make_request (mddev_t *mddev, struct bio *bio) 
	return 1;

}



static void linear_status (struct seq_file *seq, mddev_t *mddev)

static void linear_status (struct seq_file *seq, struct mddev *mddev)

{



	seq_printf(seq, " %dk rounding", mddev->chunk_sectors / 2);