Commit 7b92813c authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by NeilBrown
Browse files

drivers/md: Remove unnecessary casts of void * 



void pointers do not need to be cast to other pointer types.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 696fcd53

drivers/md/bitmap.c

+4 −4
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ void bitmap_update_sb(struct bitmap *bitmap) 
		return;

	}

	spin_unlock_irqrestore(&bitmap->lock, flags);

	sb = (bitmap_super_t *)kmap_atomic(bitmap->sb_page, KM_USER0);

	sb = kmap_atomic(bitmap->sb_page, KM_USER0);

	sb->events = cpu_to_le64(bitmap->mddev->events);

	if (bitmap->mddev->events < bitmap->events_cleared) {

		/* rocking back to read-only */
@@ -526,7 +526,7 @@ void bitmap_print_sb(struct bitmap *bitmap) 


	if (!bitmap || !bitmap->sb_page)

		return;

	sb = (bitmap_super_t *)kmap_atomic(bitmap->sb_page, KM_USER0);

	sb = kmap_atomic(bitmap->sb_page, KM_USER0);

	printk(KERN_DEBUG "%s: bitmap file superblock:\n", bmname(bitmap));

	printk(KERN_DEBUG "         magic: %08x\n", le32_to_cpu(sb->magic));

	printk(KERN_DEBUG "       version: %d\n", le32_to_cpu(sb->version));
@@ -575,7 +575,7 @@ static int bitmap_read_sb(struct bitmap *bitmap) 
		return err;

	}



	sb = (bitmap_super_t *)kmap_atomic(bitmap->sb_page, KM_USER0);

	sb = kmap_atomic(bitmap->sb_page, KM_USER0);



	chunksize = le32_to_cpu(sb->chunksize);

	daemon_sleep = le32_to_cpu(sb->daemon_sleep) * HZ;
@@ -661,7 +661,7 @@ static int bitmap_mask_state(struct bitmap *bitmap, enum bitmap_state bits, 
		return 0;

	}

	spin_unlock_irqrestore(&bitmap->lock, flags);

	sb = (bitmap_super_t *)kmap_atomic(bitmap->sb_page, KM_USER0);

	sb = kmap_atomic(bitmap->sb_page, KM_USER0);

	old = le32_to_cpu(sb->state) & bits;

	switch (op) {

		case MASK_SET: sb->state |= cpu_to_le32(bits);

drivers/md/faulty.c

+3 −3
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static void add_sector(conf_t *conf, sector_t start, int mode) 
static int make_request(struct request_queue *q, struct bio *bio)

{

	mddev_t *mddev = q->queuedata;

	conf_t *conf = (conf_t*)mddev->private;

	conf_t *conf = mddev->private;

	int failit = 0;



	if (bio_data_dir(bio) == WRITE) {
@@ -224,7 +224,7 @@ static int make_request(struct request_queue *q, struct bio *bio) 


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

{

	conf_t *conf = (conf_t*)mddev->private;

	conf_t *conf = mddev->private;

	int n;



	if ((n=atomic_read(&conf->counters[WriteTransient])) != 0)
@@ -327,7 +327,7 @@ static int run(mddev_t *mddev) 


static int stop(mddev_t *mddev)

{

	conf_t *conf = (conf_t *)mddev->private;

	conf_t *conf = mddev->private;



	kfree(conf);

	mddev->private = NULL;

drivers/md/multipath.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static void multipath_end_bh_io (struct multipath_bh *mp_bh, int err) 
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);

	struct multipath_bh *mp_bh = bio->bi_private;

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

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

drivers/md/raid1.c

+4 −4
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static inline void update_head_pos(int disk, r1bio_t *r1_bio) 
static void raid1_end_read_request(struct bio *bio, int error)

{

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

	r1bio_t * r1_bio = (r1bio_t *)(bio->bi_private);

	r1bio_t *r1_bio = bio->bi_private;

	int mirror;

	conf_t *conf = r1_bio->mddev->private;
@@ -307,7 +307,7 @@ static void raid1_end_read_request(struct bio *bio, int error) 
static void raid1_end_write_request(struct bio *bio, int error)

{

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

	r1bio_t * r1_bio = (r1bio_t *)(bio->bi_private);

	r1bio_t *r1_bio = bio->bi_private;

	int mirror, behind = test_bit(R1BIO_BehindIO, &r1_bio->state);

	conf_t *conf = r1_bio->mddev->private;

	struct bio *to_put = NULL;
@@ -1223,7 +1223,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number) 


static void end_sync_read(struct bio *bio, int error)

{

	r1bio_t * r1_bio = (r1bio_t *)(bio->bi_private);

	r1bio_t *r1_bio = bio->bi_private;

	int i;



	for (i=r1_bio->mddev->raid_disks; i--; )
@@ -1246,7 +1246,7 @@ static void end_sync_read(struct bio *bio, int error) 
static void end_sync_write(struct bio *bio, int error)

{

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

	r1bio_t * r1_bio = (r1bio_t *)(bio->bi_private);

	r1bio_t *r1_bio = bio->bi_private;

	mddev_t *mddev = r1_bio->mddev;

	conf_t *conf = mddev->private;

	int i;

drivers/md/raid10.c

+4 −4
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static inline void update_head_pos(int slot, r10bio_t *r10_bio) 
static void raid10_end_read_request(struct bio *bio, int error)

{

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

	r10bio_t * r10_bio = (r10bio_t *)(bio->bi_private);

	r10bio_t *r10_bio = bio->bi_private;

	int slot, dev;

	conf_t *conf = r10_bio->mddev->private;
@@ -295,7 +295,7 @@ static void raid10_end_read_request(struct bio *bio, int error) 
static void raid10_end_write_request(struct bio *bio, int error)

{

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

	r10bio_t * r10_bio = (r10bio_t *)(bio->bi_private);

	r10bio_t *r10_bio = bio->bi_private;

	int slot, dev;

	conf_t *conf = r10_bio->mddev->private;
@@ -1223,7 +1223,7 @@ static int raid10_remove_disk(mddev_t *mddev, int number) 


static void end_sync_read(struct bio *bio, int error)

{

	r10bio_t * r10_bio = (r10bio_t *)(bio->bi_private);

	r10bio_t *r10_bio = bio->bi_private;

	conf_t *conf = r10_bio->mddev->private;

	int i,d;
@@ -1260,7 +1260,7 @@ static void end_sync_read(struct bio *bio, int error) 
static void end_sync_write(struct bio *bio, int error)

{

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

	r10bio_t * r10_bio = (r10bio_t *)(bio->bi_private);

	r10bio_t *r10_bio = bio->bi_private;

	mddev_t *mddev = r10_bio->mddev;

	conf_t *conf = mddev->private;

	int i,d;