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

md: move two macros into md.h 



Both raid1 and raid10 share common resync
block size and page count, so move them into md.h.

Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent c85ba149

drivers/md/md.h

+5 −0
Original line number Diff line number Diff line
@@ -718,4 +718,9 @@ static inline void mddev_check_writesame(struct mddev *mddev, struct bio *bio) 
	    !bdev_get_queue(bio->bi_bdev)->limits.max_write_same_sectors)

		mddev->queue->limits.max_write_same_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)



#endif /* _MD_MD_H */

drivers/md/raid1.c

+0 −2
Original line number Diff line number Diff line
@@ -95,10 +95,8 @@ static void r1bio_pool_free(void *r1_bio, void *data) 
	kfree(r1_bio);

}



#define RESYNC_BLOCK_SIZE (64*1024)

#define RESYNC_DEPTH 32

#define RESYNC_SECTORS (RESYNC_BLOCK_SIZE >> 9)

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

#define RESYNC_WINDOW (RESYNC_BLOCK_SIZE * RESYNC_DEPTH)

#define RESYNC_WINDOW_SECTORS (RESYNC_WINDOW >> 9)

#define CLUSTER_RESYNC_WINDOW (16 * RESYNC_WINDOW)

drivers/md/raid10.c

+0 −3
Original line number Diff line number Diff line
@@ -125,9 +125,6 @@ static void r10bio_pool_free(void *r10_bio, void *data) 
	kfree(r10_bio);

}



/* Maximum size of each resync request */

#define RESYNC_BLOCK_SIZE (64*1024)

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

/* amount of memory to reserve for resync requests */

#define RESYNC_WINDOW (1024*1024)

/* maximum number of concurrent requests, memory permitting */