From: Xiao Ni <xni@redhat.com>
To: song@kernel.org
Cc: guoqing.jiang@linux.dev, ncroxon@redhat.com, linux-raid@vger.kernel.org
Subject: [PATCH 1/2] md/raid0: Free r0conf memory when register integrity failed
Date: Thu, 9 Dec 2021 13:55:23 +0800 [thread overview]
Message-ID: <1639029324-4026-2-git-send-email-xni@redhat.com> (raw)
In-Reply-To: <1639029324-4026-1-git-send-email-xni@redhat.com>
It doesn't free memory when register integrity failed. And move
free conf codes into a single function.
Signed-off-by: Xiao Ni <xni@redhat.com>
---
drivers/md/raid0.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 62c8b6adac70..3fa47df1c60e 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -356,6 +356,7 @@ static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks
return array_sectors;
}
+static void free_conf(struct r0conf *conf);
static void raid0_free(struct mddev *mddev, void *priv);
static int raid0_run(struct mddev *mddev)
@@ -413,19 +414,30 @@ static int raid0_run(struct mddev *mddev)
dump_zones(mddev);
ret = md_integrity_register(mddev);
+ if (ret)
+ goto free;
return ret;
+
+free:
+ free_conf(conf);
+ return ret;
}
-static void raid0_free(struct mddev *mddev, void *priv)
+static void free_conf(struct r0conf *conf)
{
- struct r0conf *conf = priv;
-
kfree(conf->strip_zone);
kfree(conf->devlist);
kfree(conf);
}
+static void raid0_free(struct mddev *mddev, void *priv)
+{
+ struct r0conf *conf = priv;
+
+ free_conf(conf);
+}
+
static void raid0_handle_discard(struct mddev *mddev, struct bio *bio)
{
struct r0conf *conf = mddev->private;
--
2.31.1
next prev parent reply other threads:[~2021-12-09 5:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-09 5:55 [PATCH 0/2] md: it panic after reshape from raid1 to raid5 Xiao Ni
2021-12-09 5:55 ` Xiao Ni [this message]
2021-12-09 18:02 ` [PATCH 1/2] md/raid0: Free r0conf memory when register integrity failed Song Liu
2021-12-10 1:18 ` Xiao Ni
2021-12-10 2:07 ` Guoqing Jiang
2021-12-10 2:17 ` Xiao Ni
2021-12-10 2:27 ` Song Liu
2021-12-10 1:22 ` Guoqing Jiang
2021-12-10 1:34 ` Xiao Ni
2021-12-10 1:43 ` Guoqing Jiang
2021-12-10 2:29 ` Song Liu
2021-12-10 1:51 ` Xiao Ni
2021-12-09 5:55 ` [PATCH 2/2] md: Move alloc/free acct bioset in to personality Xiao Ni
2021-12-10 1:30 ` Guoqing Jiang
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=1639029324-4026-2-git-send-email-xni@redhat.com \
--to=xni@redhat.com \
--cc=guoqing.jiang@linux.dev \
--cc=linux-raid@vger.kernel.org \
--cc=ncroxon@redhat.com \
--cc=song@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.