From: Guoqing Jiang <gqjiang@suse.com>
To: neilb@suse.de
Cc: rgoldwyn@suse.de, linux-raid@vger.kernel.org
Subject: [PATCH 09/12] md-cluster: add missed lockres_free
Date: Fri, 10 Jul 2015 17:01:20 +0800 [thread overview]
Message-ID: <1436518883-12783-6-git-send-email-gqjiang@suse.com> (raw)
In-Reply-To: <1436518883-12783-1-git-send-email-gqjiang@suse.com>
We also need to free the lock resource before goto out.
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
---
drivers/md/md-cluster.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index 057a973..411b430 100644
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -647,8 +647,10 @@ static int gather_all_resync_info(struct mddev *mddev, int total_slots)
lockres_free(bm_lockres);
continue;
}
- if (ret)
+ if (ret) {
+ lockres_free(bm_lockres);
goto out;
+ }
/* TODO: Read the disk bitmap sb and check if it needs recovery */
dlm_unlock_sync(bm_lockres);
lockres_free(bm_lockres);
--
1.7.12.4
next prev parent reply other threads:[~2015-07-10 9:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 8:54 [PATCH 00/12] md-cluster: code improvement, fixs and new feature Guoqing Jiang
2015-07-10 8:54 ` [PATCH 01/12] md-cluster: use %pU to print UUIDs Guoqing Jiang
2015-07-27 16:21 ` Goldwyn Rodrigues
2015-07-10 8:54 ` [PATCH 02/12] md-cluster: split recover_slot for future code reuse Guoqing Jiang
2015-07-10 8:54 ` [PATCH 03/12] md-cluster: transfer the resync ownership to another node Guoqing Jiang
2015-07-27 16:24 ` Goldwyn Rodrigues
2015-07-10 9:01 ` [PATCH 04/12] md-cluster: fix deadlock issue on message lock Guoqing Jiang
2015-07-10 9:01 ` [PATCH 05/12] md-cluster: init completion within lockres_init Guoqing Jiang
2015-07-27 16:44 ` Goldwyn Rodrigues
2015-07-10 9:01 ` [PATCH 06/12] md-cluster: add the error check if failed to get dlm lock Guoqing Jiang
2015-07-27 16:48 ` Goldwyn Rodrigues
2015-07-28 3:04 ` Guoqing Jiang
2015-07-29 0:22 ` NeilBrown
2015-07-29 2:03 ` Guoqing Jiang
2015-07-29 23:39 ` Goldwyn Rodrigues
2015-07-10 9:01 ` [PATCH 07/12] md-cluster: init suspend_list and suspend_lock early in join Guoqing Jiang
2015-07-27 16:29 ` Goldwyn Rodrigues
2015-07-10 9:01 ` [PATCH 08/12] md-cluster: remove the unused sb_lock Guoqing Jiang
2015-07-27 16:29 ` Goldwyn Rodrigues
2015-07-10 9:01 ` Guoqing Jiang [this message]
2015-07-27 16:30 ` [PATCH 09/12] md-cluster: add missed lockres_free Goldwyn Rodrigues
2015-07-10 9:01 ` [PATCH 10/12] md-cluster: only call complete(&cinfo->completion) when node join cluster Guoqing Jiang
2015-07-27 16:49 ` Goldwyn Rodrigues
2015-07-10 9:01 ` [PATCH 11/12] md-cluster: Read the disk bitmap sb and check if it needs recovery Guoqing Jiang
2015-07-27 16:31 ` Goldwyn Rodrigues
2015-07-10 9:01 ` [PATCH 12/12] md-cluster: handle error situations more precisely in lockres_init Guoqing Jiang
2015-07-27 16:34 ` Goldwyn Rodrigues
2015-07-28 3:05 ` Guoqing Jiang
2015-07-27 16:25 ` [PATCH 04/12] md-cluster: fix deadlock issue on message lock Goldwyn Rodrigues
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=1436518883-12783-6-git-send-email-gqjiang@suse.com \
--to=gqjiang@suse.com \
--cc=linux-raid@vger.kernel.org \
--cc=neilb@suse.de \
--cc=rgoldwyn@suse.de \
/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).