From: Christoph Hellwig <hch@lst.de>
To: Shaohua Li <shli@fb.com>, neilb@suse.de
Cc: dan.j.williams@intel.com, Kernel-team@fb.com, linux-raid@vger.kernel.org
Subject: [PATCH 02/11] raid5-cache: rename flushed_ios to finished_ios
Date: Mon, 5 Oct 2015 09:31:07 +0200 [thread overview]
Message-ID: <1444030276-30850-3-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1444030276-30850-1-git-send-email-hch@lst.de>
After this series we won't nessecarily have flushed the cache for these
I/Os, so give the list a more neutral name.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/md/raid5-cache.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 5b5f346..9f5a48e 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -66,7 +66,7 @@ struct r5l_log {
* to the RAID */
struct list_head flushing_ios; /* io_units which are waiting for log
* cache flush */
- struct list_head flushed_ios; /* io_units which settle down in log disk */
+ struct list_head finished_ios; /* io_units which settle down in log disk */
struct bio flush_bio;
struct kmem_cache *io_kc;
@@ -525,14 +525,14 @@ static sector_t r5l_reclaimable_space(struct r5l_log *log)
log->next_checkpoint);
}
-static bool r5l_complete_flushed_ios(struct r5l_log *log)
+static bool r5l_complete_finished_ios(struct r5l_log *log)
{
struct r5l_io_unit *io, *next;
bool found = false;
assert_spin_locked(&log->io_list_lock);
- list_for_each_entry_safe(io, next, &log->flushed_ios, log_sibling) {
+ list_for_each_entry_safe(io, next, &log->finished_ios, log_sibling) {
/* don't change list order */
if (io->state < IO_UNIT_STRIPE_END)
break;
@@ -558,7 +558,7 @@ static void __r5l_stripe_write_finished(struct r5l_io_unit *io)
spin_lock_irqsave(&log->io_list_lock, flags);
__r5l_set_io_unit_state(io, IO_UNIT_STRIPE_END);
- if (!r5l_complete_flushed_ios(log)) {
+ if (!r5l_complete_finished_ios(log)) {
spin_unlock_irqrestore(&log->io_list_lock, flags);
return;
}
@@ -602,7 +602,7 @@ static void r5l_log_flush_endio(struct bio *bio)
raid5_release_stripe(sh);
}
}
- list_splice_tail_init(&log->flushing_ios, &log->flushed_ios);
+ list_splice_tail_init(&log->flushing_ios, &log->finished_ios);
spin_unlock_irqrestore(&log->io_list_lock, flags);
}
@@ -701,7 +701,7 @@ static void r5l_do_reclaim(struct r5l_log *log)
(list_empty(&log->running_ios) &&
list_empty(&log->io_end_ios) &&
list_empty(&log->flushing_ios) &&
- list_empty(&log->flushed_ios)))
+ list_empty(&log->finished_ios)))
break;
md_wakeup_thread(log->rdev->mddev->thread);
@@ -1121,7 +1121,7 @@ int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
INIT_LIST_HEAD(&log->running_ios);
INIT_LIST_HEAD(&log->io_end_ios);
INIT_LIST_HEAD(&log->flushing_ios);
- INIT_LIST_HEAD(&log->flushed_ios);
+ INIT_LIST_HEAD(&log->finished_ios);
bio_init(&log->flush_bio);
log->io_kc = KMEM_CACHE(r5l_io_unit, 0);
--
1.9.1
next prev parent reply other threads:[~2015-10-05 7:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-05 7:31 raid5-cache I/O path improvements V3 Christoph Hellwig
2015-10-05 7:31 ` [PATCH 01/11] raid5-cache: free I/O units earlier Christoph Hellwig
2015-10-05 7:31 ` Christoph Hellwig [this message]
2015-10-05 7:31 ` [PATCH 03/11] raid5-cache: factor out a helper to run all stripes for an I/O unit Christoph Hellwig
2015-10-05 7:31 ` [PATCH 04/11] raid5-cache: simplify state machine when caches flushes are not needed Christoph Hellwig
2015-10-05 7:31 ` [PATCH 05/11] raid5-cache: clean up r5l_get_meta Christoph Hellwig
2015-10-05 7:31 ` [PATCH 06/11] raid5-cache: refactor bio allocation Christoph Hellwig
2015-10-05 7:31 ` [PATCH 07/11] raid5-cache: take rdev->data_offset into account early on Christoph Hellwig
2015-10-05 7:31 ` [PATCH 08/11] raid5-cache: inline r5l_alloc_io_unit into r5l_new_meta Christoph Hellwig
2015-10-05 7:31 ` [PATCH 09/11] raid5-cache: new helper: r5_reserve_log_entry Christoph Hellwig
2015-10-05 7:31 ` [PATCH 10/11] raid5-cache: small log->seq cleanup Christoph Hellwig
2015-10-05 7:31 ` [PATCH 11/11] raid5-cache: use bio chaining Christoph Hellwig
2015-10-06 18:14 ` raid5-cache I/O path improvements V3 Shaohua Li
2015-10-08 2:45 ` Neil Brown
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=1444030276-30850-3-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=Kernel-team@fb.com \
--cc=dan.j.williams@intel.com \
--cc=linux-raid@vger.kernel.org \
--cc=neilb@suse.de \
--cc=shli@fb.com \
/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).