Commit be453e77 authored by Ming Lei's avatar Ming Lei Committed by Shaohua Li
Browse files

md: raid1-10: move raid1/raid10 common code into raid1-10.c 



No function change, just move 'struct resync_pages' and related
helpers into raid1-10.c

Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent fb0eb5df

drivers/md/md.h

+0 −53
Original line number Diff line number Diff line
@@ -731,57 +731,4 @@ static inline void mddev_check_write_zeroes(struct mddev *mddev, struct bio *bio 
	    !bdev_get_queue(bio->bi_bdev)->limits.max_write_zeroes_sectors)

		mddev->queue->limits.max_write_zeroes_sectors = 0;

}



/* Maximum size of each resync request */

#define RESYNC_BLOCK_SIZE (64*1024)

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



/* for managing resync I/O pages */

struct resync_pages {

	void		*raid_bio;

	struct page	*pages[RESYNC_PAGES];

};



static inline int resync_alloc_pages(struct resync_pages *rp,

				     gfp_t gfp_flags)

{

	int i;



	for (i = 0; i < RESYNC_PAGES; i++) {

		rp->pages[i] = alloc_page(gfp_flags);

		if (!rp->pages[i])

			goto out_free;

	}



	return 0;



out_free:

	while (--i >= 0)

		put_page(rp->pages[i]);

	return -ENOMEM;

}



static inline void resync_free_pages(struct resync_pages *rp)

{

	int i;



	for (i = 0; i < RESYNC_PAGES; i++)

		put_page(rp->pages[i]);

}



static inline void resync_get_all_pages(struct resync_pages *rp)

{

	int i;



	for (i = 0; i < RESYNC_PAGES; i++)

		get_page(rp->pages[i]);

}



static inline struct page *resync_fetch_page(struct resync_pages *rp,

					     unsigned idx)

{

	if (WARN_ON_ONCE(idx >= RESYNC_PAGES))

		return NULL;

	return rp->pages[idx];

}

#endif /* _MD_MD_H */

drivers/md/raid1-10.c

+62 −0
Original line number Diff line number Diff line 
/* Maximum size of each resync request */

#define RESYNC_BLOCK_SIZE (64*1024)

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



/* for managing resync I/O pages */

struct resync_pages {

	void		*raid_bio;

	struct page	*pages[RESYNC_PAGES];

};



static inline int resync_alloc_pages(struct resync_pages *rp,

				     gfp_t gfp_flags)

{

	int i;



	for (i = 0; i < RESYNC_PAGES; i++) {

		rp->pages[i] = alloc_page(gfp_flags);

		if (!rp->pages[i])

			goto out_free;

	}



	return 0;



out_free:

	while (--i >= 0)

		put_page(rp->pages[i]);

	return -ENOMEM;

}



static inline void resync_free_pages(struct resync_pages *rp)

{

	int i;



	for (i = 0; i < RESYNC_PAGES; i++)

		put_page(rp->pages[i]);

}



static inline void resync_get_all_pages(struct resync_pages *rp)

{

	int i;



	for (i = 0; i < RESYNC_PAGES; i++)

		get_page(rp->pages[i]);

}



static inline struct page *resync_fetch_page(struct resync_pages *rp,

					     unsigned idx)

{

	if (WARN_ON_ONCE(idx >= RESYNC_PAGES))

		return NULL;

	return rp->pages[idx];

}



/*

 * 'strct resync_pages' stores actual pages used for doing the resync

 *  IO, and it is per-bio, so make .bi_private points to it.

 */

static inline struct resync_pages *get_resync_pages(struct bio *bio)

{

	return bio->bi_private;

}



/* generally called after bio_reset() for reseting bvec */

static void md_bio_reset_resync_pages(struct bio *bio, struct resync_pages *rp,

			       int size)

drivers/md/raid1.c

+0 −9
Original line number Diff line number Diff line
@@ -83,15 +83,6 @@ static void lower_barrier(struct r1conf *conf, sector_t sector_nr); 


#include "raid1-10.c"



/*

 * 'strct resync_pages' stores actual pages used for doing the resync

 *  IO, and it is per-bio, so make .bi_private points to it.

 */

static inline struct resync_pages *get_resync_pages(struct bio *bio)

{

	return bio->bi_private;

}



/*

 * for resync bio, r1bio pointer can be retrieved from the per-bio

 * 'struct resync_pages'.

drivers/md/raid10.c

+0 −9
Original line number Diff line number Diff line
@@ -112,15 +112,6 @@ static void end_reshape(struct r10conf *conf); 


#include "raid1-10.c"



/*

 * 'strct resync_pages' stores actual pages used for doing the resync

 *  IO, and it is per-bio, so make .bi_private points to it.

 */

static inline struct resync_pages *get_resync_pages(struct bio *bio)

{

	return bio->bi_private;

}



/*

 * for resync bio, r10bio pointer can be retrieved from the per-bio

 * 'struct resync_pages'.