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 05/11] raid5-cache: clean up r5l_get_meta
Date: Mon, 5 Oct 2015 09:31:10 +0200 [thread overview]
Message-ID: <1444030276-30850-6-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1444030276-30850-1-git-send-email-hch@lst.de>
Remove the only partially used local 'io' variable to simplify the code
flow.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/md/raid5-cache.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 0d18ed7..05126151 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -324,16 +324,12 @@ static struct r5l_io_unit *r5l_new_meta(struct r5l_log *log)
static int r5l_get_meta(struct r5l_log *log, unsigned int payload_size)
{
- struct r5l_io_unit *io;
-
- io = log->current_io;
- if (io && io->meta_offset + payload_size > PAGE_SIZE)
+ if (log->current_io &&
+ log->current_io->meta_offset + payload_size > PAGE_SIZE)
r5l_submit_current_io(log);
- io = log->current_io;
- if (io)
- return 0;
- log->current_io = r5l_new_meta(log);
+ if (!log->current_io)
+ log->current_io = r5l_new_meta(log);
return 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 ` [PATCH 02/11] raid5-cache: rename flushed_ios to finished_ios Christoph Hellwig
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 ` Christoph Hellwig [this message]
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-6-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).