Commit 3f677f9c authored by Marcos Paulo de Souza's avatar Marcos Paulo de Souza Committed by Jens Axboe
Browse files

drivers: md: Unify common definitions of raid1 and raid10 



These definitions are being moved to raid1-10.c.

Signed-off-by: default avatarMarcos Paulo de Souza <marcos.souza.org@gmail.com>
Signed-off-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7b103151

drivers/md/raid1-10.c

+25 −0
Original line number Diff line number Diff line
@@ -3,6 +3,31 @@ 
#define RESYNC_BLOCK_SIZE (64*1024)

#define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE)



/*

 * Number of guaranteed raid bios in case of extreme VM load:

 */

#define	NR_RAID_BIOS 256



/* when we get a read error on a read-only array, we redirect to another

 * device without failing the first device, or trying to over-write to

 * correct the read error.  To keep track of bad blocks on a per-bio

 * level, we store IO_BLOCKED in the appropriate 'bios' pointer

 */

#define IO_BLOCKED ((struct bio *)1)

/* When we successfully write to a known bad-block, we need to remove the

 * bad-block marking which must be done from process context.  So we record

 * the success by setting devs[n].bio to IO_MADE_GOOD

 */

#define IO_MADE_GOOD ((struct bio *)2)



#define BIO_SPECIAL(bio) ((unsigned long)bio <= 2)



/* When there are this many requests queue to be written by

 * the raid thread, we become 'congested' to provide back-pressure

 * for writeback.

 */

static int max_queued_requests = 1024;



/* for managing resync I/O pages */

struct resync_pages {

	void		*raid_bio;

drivers/md/raid1.c

+2 −27
Original line number Diff line number Diff line
@@ -42,31 +42,6 @@ 
	 (1L << MD_HAS_PPL) |		\

	 (1L << MD_HAS_MULTIPLE_PPLS))



/*

 * Number of guaranteed r1bios in case of extreme VM load:

 */

#define	NR_RAID1_BIOS 256



/* when we get a read error on a read-only array, we redirect to another

 * device without failing the first device, or trying to over-write to

 * correct the read error.  To keep track of bad blocks on a per-bio

 * level, we store IO_BLOCKED in the appropriate 'bios' pointer

 */

#define IO_BLOCKED ((struct bio *)1)

/* When we successfully write to a known bad-block, we need to remove the

 * bad-block marking which must be done from process context.  So we record

 * the success by setting devs[n].bio to IO_MADE_GOOD

 */

#define IO_MADE_GOOD ((struct bio *)2)



#define BIO_SPECIAL(bio) ((unsigned long)bio <= 2)



/* When there are this many requests queue to be written by

 * the raid1 thread, we become 'congested' to provide back-pressure

 * for writeback.

 */

static int max_queued_requests = 1024;



static void allow_barrier(struct r1conf *conf, sector_t sector_nr);

static void lower_barrier(struct r1conf *conf, sector_t sector_nr);
@@ -2947,7 +2922,7 @@ static struct r1conf *setup_conf(struct mddev *mddev) 
	if (!conf->poolinfo)

		goto abort;

	conf->poolinfo->raid_disks = mddev->raid_disks * 2;

	err = mempool_init(&conf->r1bio_pool, NR_RAID1_BIOS, r1bio_pool_alloc,

	err = mempool_init(&conf->r1bio_pool, NR_RAID_BIOS, r1bio_pool_alloc,

			   r1bio_pool_free, conf->poolinfo);

	if (err)

		goto abort;
@@ -3232,7 +3207,7 @@ static int raid1_reshape(struct mddev *mddev) 
	newpoolinfo->mddev = mddev;

	newpoolinfo->raid_disks = raid_disks * 2;



	ret = mempool_init(&newpool, NR_RAID1_BIOS, r1bio_pool_alloc,

	ret = mempool_init(&newpool, NR_RAID_BIOS, r1bio_pool_alloc,

			   r1bio_pool_free, newpoolinfo);

	if (ret) {

		kfree(newpoolinfo);

drivers/md/raid10.c

+1 −26
Original line number Diff line number Diff line
@@ -64,31 +64,6 @@ 
 *    [B A] [D C]    [B A] [E C D]

 */



/*

 * Number of guaranteed r10bios in case of extreme VM load:

 */

#define	NR_RAID10_BIOS 256



/* when we get a read error on a read-only array, we redirect to another

 * device without failing the first device, or trying to over-write to

 * correct the read error.  To keep track of bad blocks on a per-bio

 * level, we store IO_BLOCKED in the appropriate 'bios' pointer

 */

#define IO_BLOCKED ((struct bio *)1)

/* When we successfully write to a known bad-block, we need to remove the

 * bad-block marking which must be done from process context.  So we record

 * the success by setting devs[n].bio to IO_MADE_GOOD

 */

#define IO_MADE_GOOD ((struct bio *)2)



#define BIO_SPECIAL(bio) ((unsigned long)bio <= 2)



/* When there are this many requests queued to be written by

 * the raid10 thread, we become 'congested' to provide back-pressure

 * for writeback.

 */

static int max_queued_requests = 1024;



static void allow_barrier(struct r10conf *conf);

static void lower_barrier(struct r10conf *conf);

static int _enough(struct r10conf *conf, int previous, int ignore);
@@ -3675,7 +3650,7 @@ static struct r10conf *setup_conf(struct mddev *mddev) 


	conf->geo = geo;

	conf->copies = copies;

	err = mempool_init(&conf->r10bio_pool, NR_RAID10_BIOS, r10bio_pool_alloc,

	err = mempool_init(&conf->r10bio_pool, NR_RAID_BIOS, r10bio_pool_alloc,

			   r10bio_pool_free, conf);

	if (err)

		goto out;