From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
Song Liu <song@kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>,
Donald Buczek <buczek@molgen.mpg.de>,
Guoqing Jiang <guoqing.jiang@linux.dev>, Xiao Ni <xni@redhat.com>,
Stephen Bates <sbates@raithlin.com>,
Martin Oliveira <Martin.Oliveira@eideticom.com>,
David Sloan <David.Sloan@eideticom.com>,
Logan Gunthorpe <logang@deltatee.com>,
Christoph Hellwig <hch@lst.de>
Subject: [PATCH v2 09/17] md/raid5-cache: Don't pass conf to r5c_calculate_new_cp()
Date: Thu, 26 May 2022 10:35:56 -0600 [thread overview]
Message-ID: <20220526163604.32736-10-logang@deltatee.com> (raw)
In-Reply-To: <20220526163604.32736-1-logang@deltatee.com>
r5c_calculate_new_cp() only uses conf to dereference the log which
both callers already have a pointer to and no longer need to
obtain a conf through a complicated dereference chain for this use.
No functional changes intended.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
drivers/md/raid5-cache.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 8284ce3e5cf6..9a8f2a988b03 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -1168,10 +1168,9 @@ static void r5l_run_no_space_stripes(struct r5l_log *log)
* for write through mode, returns log->next_checkpoint
* for write back, returns log_start of first sh in stripe_in_journal_list
*/
-static sector_t r5c_calculate_new_cp(struct r5conf *conf)
+static sector_t r5c_calculate_new_cp(struct r5l_log *log)
{
struct stripe_head *sh;
- struct r5l_log *log = conf->log;
sector_t new_cp;
unsigned long flags;
@@ -1179,12 +1178,12 @@ static sector_t r5c_calculate_new_cp(struct r5conf *conf)
return log->next_checkpoint;
spin_lock_irqsave(&log->stripe_in_journal_lock, flags);
- if (list_empty(&conf->log->stripe_in_journal_list)) {
+ if (list_empty(&log->stripe_in_journal_list)) {
/* all stripes flushed */
spin_unlock_irqrestore(&log->stripe_in_journal_lock, flags);
return log->next_checkpoint;
}
- sh = list_first_entry(&conf->log->stripe_in_journal_list,
+ sh = list_first_entry(&log->stripe_in_journal_list,
struct stripe_head, r5c);
new_cp = sh->log_start;
spin_unlock_irqrestore(&log->stripe_in_journal_lock, flags);
@@ -1193,10 +1192,8 @@ static sector_t r5c_calculate_new_cp(struct r5conf *conf)
static sector_t r5l_reclaimable_space(struct r5l_log *log)
{
- struct r5conf *conf = log->rdev->mddev->private;
-
return r5l_ring_distance(log, log->last_checkpoint,
- r5c_calculate_new_cp(conf));
+ r5c_calculate_new_cp(log));
}
static void r5l_run_no_mem_stripe(struct r5l_log *log)
@@ -1517,7 +1514,6 @@ static void r5c_do_reclaim(struct r5conf *conf)
static void r5l_do_reclaim(struct r5l_log *log)
{
- struct r5conf *conf = log->rdev->mddev->private;
sector_t reclaim_target = xchg(&log->reclaim_target, 0);
sector_t reclaimable;
sector_t next_checkpoint;
@@ -1546,7 +1542,7 @@ static void r5l_do_reclaim(struct r5l_log *log)
log->io_list_lock);
}
- next_checkpoint = r5c_calculate_new_cp(conf);
+ next_checkpoint = r5c_calculate_new_cp(log);
spin_unlock_irq(&log->io_list_lock);
if (reclaimable == 0 || !write_super)
--
2.30.2
next prev parent reply other threads:[~2022-05-26 16:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 16:35 [PATCH v2 00/17] Bug fixes for mdadm tests Logan Gunthorpe
2022-05-26 16:35 ` [PATCH v2 01/17] md/raid5-log: Drop extern decorators for function prototypes Logan Gunthorpe
2022-05-26 16:35 ` [PATCH v2 02/17] md/raid5-cache: Add r5c_conf_is_writeback() helper Logan Gunthorpe
2022-05-30 5:56 ` Christoph Hellwig
2022-05-26 16:35 ` [PATCH v2 03/17] md/raid5-cache: Refactor r5l_start() to take a struct r5conf Logan Gunthorpe
2022-05-26 16:35 ` [PATCH v2 04/17] md/raid5-cache: Refactor r5l_flush_stripe_to_raid() " Logan Gunthorpe
2022-05-26 16:35 ` [PATCH v2 05/17] md/raid5-cache: Refactor r5l_wake_reclaim() " Logan Gunthorpe
2022-05-26 16:35 ` [PATCH v2 06/17] md/raid5-cache: Refactor remaining functions to take a r5conf Logan Gunthorpe
2022-05-26 16:35 ` [PATCH v2 07/17] md/raid5-ppl: Drop unused argument from ppl_handle_flush_request() Logan Gunthorpe
2022-05-26 16:35 ` [PATCH v2 08/17] md/raid5-cache: Pass the log through to r5c_finish_cache_stripe() Logan Gunthorpe
2022-05-26 16:35 ` Logan Gunthorpe [this message]
2022-05-26 16:35 ` [PATCH v2 10/17] md/raid5-cache: Take struct r5l_log in r5c_log_required_to_flush_cache() Logan Gunthorpe
2022-05-26 16:35 ` [PATCH v2 11/17] md/raid5: Ensure array is suspended for calls to log_exit() Logan Gunthorpe
2022-05-26 16:35 ` [PATCH v2 12/17] md/raid5-cache: Move struct r5l_log definition to raid5-log.h Logan Gunthorpe
2022-05-30 5:59 ` Christoph Hellwig
2022-05-30 15:48 ` Logan Gunthorpe
2022-06-01 22:36 ` Song Liu
2022-06-01 22:42 ` Logan Gunthorpe
2022-06-01 22:50 ` Song Liu
2022-05-26 16:36 ` [PATCH v2 13/17] md/raid5-cache: Add RCU protection to conf->log accesses Logan Gunthorpe
2022-05-30 6:01 ` Christoph Hellwig
2022-05-30 15:57 ` Logan Gunthorpe
2022-05-26 16:36 ` [PATCH v2 14/17] md/raid5-cache: Annotate pslot with __rcu notation Logan Gunthorpe
2022-05-26 16:36 ` [PATCH v2 15/17] md: Use enum for overloaded magic numbers used by mddev->curr_resync Logan Gunthorpe
2022-05-30 6:01 ` Christoph Hellwig
2022-05-30 15:43 ` Logan Gunthorpe
2022-05-26 16:36 ` [PATCH v2 16/17] md: Ensure resync is reported after it starts Logan Gunthorpe
2022-05-30 6:02 ` Christoph Hellwig
2022-05-26 16:36 ` [PATCH v2 17/17] md: Notify sysfs sync_completed in md_reap_sync_thread() Logan Gunthorpe
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=20220526163604.32736-10-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=David.Sloan@eideticom.com \
--cc=Martin.Oliveira@eideticom.com \
--cc=buczek@molgen.mpg.de \
--cc=guoqing.jiang@linux.dev \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=sbates@raithlin.com \
--cc=song@kernel.org \
--cc=xni@redhat.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).