From: Ming Lei <tom.leiming@gmail.com>
To: Shaohua Li <shli@kernel.org>, Jens Axboe <axboe@fb.com>,
linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
linux-block@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>
Cc: Ming Lei <tom.leiming@gmail.com>
Subject: [PATCH v1 04/14] md: move two macros into md.h
Date: Fri, 24 Feb 2017 23:42:41 +0800 [thread overview]
Message-ID: <1487950971-1131-5-git-send-email-tom.leiming@gmail.com> (raw)
In-Reply-To: <1487950971-1131-1-git-send-email-tom.leiming@gmail.com>
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>
---
drivers/md/md.h | 5 +++++
drivers/md/raid1.c | 2 --
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 b8859cbf84b6..1d63239a1be4 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -715,4 +715,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 2a0bf5b430c9..2013e5870761 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -91,10 +91,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 125d74dba27e..227dd6ad7716 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 */
--
2.7.4
next prev parent reply other threads:[~2017-02-24 15:42 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 15:42 [PATCH v1 00/14] md: cleanup on direct access to bvec table Ming Lei
2017-02-24 15:42 ` [PATCH v1 01/14] block: introduce bio_segments_all() Ming Lei
2017-02-25 18:22 ` Christoph Hellwig
2017-02-28 12:15 ` Ming Lei
2017-02-24 15:42 ` [PATCH v1 02/14] block: introduce bio_remove_last_page() Ming Lei
2017-02-25 18:23 ` Christoph Hellwig
2017-02-28 12:18 ` Ming Lei
2017-02-24 15:42 ` [PATCH v1 03/14] md: raid1/raid10: use bio_remove_last_page() Ming Lei
2017-02-24 15:42 ` Ming Lei [this message]
2017-02-24 15:42 ` [PATCH v1 05/14] md: prepare for managing resync I/O pages in clean way Ming Lei
2017-02-24 15:42 ` [PATCH v1 06/14] md: raid1: simplify r1buf_pool_free() Ming Lei
2017-02-24 15:42 ` [PATCH v1 07/14] md: raid1: don't use bio's vec table to manage resync pages Ming Lei
2017-02-24 15:42 ` [PATCH v1 08/14] md: raid1: retrieve page from pre-allocated resync page array Ming Lei
2017-02-24 15:42 ` [PATCH v1 09/14] md: raid1: use bio helper in process_checks() Ming Lei
2017-02-24 15:42 ` [PATCH v1 10/14] md: raid1: use bio_segments_all() Ming Lei
2017-02-24 15:42 ` [PATCH v1 11/14] md: raid10: refactor code of read reshape's .bi_end_io Ming Lei
2017-02-24 15:42 ` [PATCH v1 12/14] md: raid10: don't use bio's vec table to manage resync pages Ming Lei
2017-02-24 15:42 ` [PATCH v1 13/14] md: raid10: retrieve page from preallocated resync page array Ming Lei
2017-02-24 15:42 ` [PATCH v1 14/14] md: raid10: avoid direct access to bvec table in handle_reshape_read_error Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487950971-1131-5-git-send-email-tom.leiming@gmail.com \
--to=tom.leiming@gmail.com \
--cc=axboe@fb.com \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=shli@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).