Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 070ec55d authored by NeilBrown's avatar NeilBrown
Browse files

md: remove mddev_to_conf "helper" macro 



Having a macro just to cast a void* isn't really helpful.
I would must rather see that we are simply de-referencing ->private,
than have to know what the macro does.

So open code the macro everywhere and remove the pointless cast.

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

drivers/md/linear.c

+6 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector)

{

	dev_info_t *hash;

	linear_conf_t *conf = mddev_to_conf(mddev);

	linear_conf_t *conf = mddev->private;

	sector_t idx = sector >> conf->sector_shift;



	/*
@@ -79,7 +79,7 @@ static int linear_mergeable_bvec(struct request_queue *q, 
static void linear_unplug(struct request_queue *q)

{

	mddev_t *mddev = q->queuedata;

	linear_conf_t *conf = mddev_to_conf(mddev);

	linear_conf_t *conf = mddev->private;

	int i;



	for (i=0; i < mddev->raid_disks; i++) {
@@ -91,7 +91,7 @@ static void linear_unplug(struct request_queue *q) 
static int linear_congested(void *data, int bits)

{

	mddev_t *mddev = data;

	linear_conf_t *conf = mddev_to_conf(mddev);

	linear_conf_t *conf = mddev->private;

	int i, ret = 0;



	for (i = 0; i < mddev->raid_disks && !ret ; i++) {
@@ -103,7 +103,7 @@ static int linear_congested(void *data, int bits) 


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

{

	linear_conf_t *conf = mddev_to_conf(mddev);

	linear_conf_t *conf = mddev->private;



	WARN_ONCE(sectors || raid_disks,

		  "%s does not support generic reshape\n", __func__);
@@ -294,7 +294,7 @@ static int linear_add(mddev_t *mddev, mdk_rdev_t *rdev) 
	if (!newconf)

		return -ENOMEM;



	newconf->prev = mddev_to_conf(mddev);

	newconf->prev = mddev->private;

	mddev->private = newconf;

	mddev->raid_disks++;

	md_set_array_sectors(mddev, linear_size(mddev, 0, 0));
@@ -304,7 +304,7 @@ static int linear_add(mddev_t *mddev, mdk_rdev_t *rdev) 


static int linear_stop (mddev_t *mddev)

{

	linear_conf_t *conf = mddev_to_conf(mddev);

	linear_conf_t *conf = mddev->private;

  

	blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/

	do {

drivers/md/linear.h

+0 −2
Original line number Diff line number Diff line
@@ -24,6 +24,4 @@ struct linear_private_data 


typedef struct linear_private_data linear_conf_t;



#define mddev_to_conf(mddev) ((linear_conf_t *) mddev->private)



#endif

drivers/md/multipath.c

+10 −10
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static void multipath_reschedule_retry (struct multipath_bh *mp_bh) 
{

	unsigned long flags;

	mddev_t *mddev = mp_bh->mddev;

	multipath_conf_t *conf = mddev_to_conf(mddev);

	multipath_conf_t *conf = mddev->private;



	spin_lock_irqsave(&conf->device_lock, flags);

	list_add(&mp_bh->retry_list, &conf->retry_list);
@@ -75,7 +75,7 @@ static void multipath_reschedule_retry (struct multipath_bh *mp_bh) 
static void multipath_end_bh_io (struct multipath_bh *mp_bh, int err)

{

	struct bio *bio = mp_bh->master_bio;

	multipath_conf_t *conf = mddev_to_conf(mp_bh->mddev);

	multipath_conf_t *conf = mp_bh->mddev->private;



	bio_endio(bio, err);

	mempool_free(mp_bh, conf->pool);
@@ -85,7 +85,7 @@ static void multipath_end_request(struct bio *bio, int error) 
{

	int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);

	struct multipath_bh * mp_bh = (struct multipath_bh *)(bio->bi_private);

	multipath_conf_t *conf = mddev_to_conf(mp_bh->mddev);

	multipath_conf_t *conf = mp_bh->mddev->private;

	mdk_rdev_t *rdev = conf->multipaths[mp_bh->path].rdev;



	if (uptodate)
@@ -107,7 +107,7 @@ static void multipath_end_request(struct bio *bio, int error) 


static void unplug_slaves(mddev_t *mddev)

{

	multipath_conf_t *conf = mddev_to_conf(mddev);

	multipath_conf_t *conf = mddev->private;

	int i;



	rcu_read_lock();
@@ -138,7 +138,7 @@ static void multipath_unplug(struct request_queue *q) 
static int multipath_make_request (struct request_queue *q, struct bio * bio)

{

	mddev_t *mddev = q->queuedata;

	multipath_conf_t *conf = mddev_to_conf(mddev);

	multipath_conf_t *conf = mddev->private;

	struct multipath_bh * mp_bh;

	struct multipath_info *multipath;

	const int rw = bio_data_dir(bio);
@@ -180,7 +180,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio) 


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

{

	multipath_conf_t *conf = mddev_to_conf(mddev);

	multipath_conf_t *conf = mddev->private;

	int i;

	

	seq_printf (seq, " [%d/%d] [", conf->raid_disks,
@@ -195,7 +195,7 @@ static void multipath_status (struct seq_file *seq, mddev_t *mddev) 
static int multipath_congested(void *data, int bits)

{

	mddev_t *mddev = data;

	multipath_conf_t *conf = mddev_to_conf(mddev);

	multipath_conf_t *conf = mddev->private;

	int i, ret = 0;



	rcu_read_lock();
@@ -220,7 +220,7 @@ static int multipath_congested(void *data, int bits) 
 */

static void multipath_error (mddev_t *mddev, mdk_rdev_t *rdev)

{

	multipath_conf_t *conf = mddev_to_conf(mddev);

	multipath_conf_t *conf = mddev->private;



	if (conf->working_disks <= 1) {

		/*
@@ -367,7 +367,7 @@ static void multipathd (mddev_t *mddev) 
	struct multipath_bh *mp_bh;

	struct bio *bio;

	unsigned long flags;

	multipath_conf_t *conf = mddev_to_conf(mddev);

	multipath_conf_t *conf = mddev->private;

	struct list_head *head = &conf->retry_list;



	md_check_recovery(mddev);
@@ -531,7 +531,7 @@ out: 


static int multipath_stop (mddev_t *mddev)

{

	multipath_conf_t *conf = mddev_to_conf(mddev);

	multipath_conf_t *conf = mddev->private;



	md_unregister_thread(mddev->thread);

	mddev->thread = NULL;

drivers/md/multipath.h

+0 −6
Original line number Diff line number Diff line
@@ -18,12 +18,6 @@ struct multipath_private_data { 


typedef struct multipath_private_data multipath_conf_t;



/*

 * this is the only point in the RAID code where we violate

 * C type safety. mddev->private is an 'opaque' pointer.

 */

#define mddev_to_conf(mddev) ((multipath_conf_t *) mddev->private)



/*

 * this is our 'private' 'collective' MULTIPATH buffer head.

 * it contains information about what kind of IO operations were started

drivers/md/raid0.c

+5 −5
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
static void raid0_unplug(struct request_queue *q)

{

	mddev_t *mddev = q->queuedata;

	raid0_conf_t *conf = mddev_to_conf(mddev);

	raid0_conf_t *conf = mddev->private;

	mdk_rdev_t **devlist = conf->devlist;

	int i;
@@ -40,7 +40,7 @@ static void raid0_unplug(struct request_queue *q) 
static int raid0_congested(void *data, int bits)

{

	mddev_t *mddev = data;

	raid0_conf_t *conf = mddev_to_conf(mddev);

	raid0_conf_t *conf = mddev->private;

	mdk_rdev_t **devlist = conf->devlist;

	int i, ret = 0;
@@ -294,7 +294,7 @@ static int raid0_run(mddev_t *mddev) 


static int raid0_stop(mddev_t *mddev)

{

	raid0_conf_t *conf = mddev_to_conf(mddev);

	raid0_conf_t *conf = mddev->private;



	blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/

	kfree(conf->strip_zone);
@@ -327,7 +327,7 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio) 
{

	mddev_t *mddev = q->queuedata;

	unsigned int sect_in_chunk, chunksect_bits, chunk_sects;

	raid0_conf_t *conf = mddev_to_conf(mddev);

	raid0_conf_t *conf = mddev->private;

	struct strip_zone *zone;

	mdk_rdev_t *tmp_dev;

	sector_t chunk;
@@ -406,7 +406,7 @@ static void raid0_status (struct seq_file *seq, mddev_t *mddev) 
#ifdef MD_DEBUG

	int j, k, h;

	char b[BDEVNAME_SIZE];

	raid0_conf_t *conf = mddev_to_conf(mddev);

	raid0_conf_t *conf = mddev->private;



	h = 0;

	for (j = 0; j < conf->nr_strip_zones; j++) {