diff options
| author | Ming Lei <tom.leiming@gmail.com> | 2017-03-17 00:12:23 +0800 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2017-03-24 10:41:36 -0700 |
| commit | d8e29fbc3bed181f2653fb89ac8c34e40db39c30 (patch) | |
| tree | 99e57ef739035372a6dbbcbe06c55e3aec63cfd1 | |
| parent | c85ba149de4bd14aa028ac824f9f12aeded28b86 (diff) | |
| download | blackbird-obmc-linux-d8e29fbc3bed181f2653fb89ac8c34e40db39c30.tar.gz blackbird-obmc-linux-d8e29fbc3bed181f2653fb89ac8c34e40db39c30.zip | |
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: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Shaohua Li <shli@fb.com>
| -rw-r--r-- | drivers/md/md.h | 5 | ||||
| -rw-r--r-- | drivers/md/raid1.c | 2 | ||||
| -rw-r--r-- | drivers/md/raid10.c | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/md/md.h b/drivers/md/md.h index 7a7847d1cc39..31d2d70849b6 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -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 */ diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 569f501fb710..c31f9e206148 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -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) diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 6c9783ba85db..301e73fe2d2f 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -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 */ |
