|
 |
190130 |
From 7e1bf1e338a6effe209f57b1b92a70d5d25a73bf Mon Sep 17 00:00:00 2001
|
|
|
190130 |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
190130 |
Date: Mon, 26 Aug 2019 11:32:18 +0530
|
|
|
190130 |
Subject: [PATCH 428/449] glusterd/ganesha: fixing resource leak in
|
|
|
190130 |
tear_down_cluster()
|
|
|
190130 |
|
|
|
190130 |
backport of https://review.gluster.org/#/c/glusterfs/+/23295/
|
|
|
190130 |
>CID: 1370947
|
|
|
190130 |
>Updates: bz#789278
|
|
|
190130 |
>Change-Id: Ib694056430ff0536ed705a0e77e5ace22486891e
|
|
|
190130 |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
190130 |
|
|
|
190130 |
BUG: 1787310
|
|
|
190130 |
Change-Id: Ib694056430ff0536ed705a0e77e5ace22486891e
|
|
|
190130 |
Signed-off-by: Barak Sason Rofman <bsasonro@redhat.com>
|
|
|
190130 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/202561
|
|
|
190130 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
190130 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
190130 |
---
|
|
|
190130 |
xlators/mgmt/glusterd/src/glusterd-ganesha.c | 8 ++++++++
|
|
|
190130 |
1 file changed, 8 insertions(+)
|
|
|
190130 |
|
|
|
190130 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
190130 |
index 0a16925..06f028f 100644
|
|
|
190130 |
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
190130 |
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
190130 |
@@ -659,10 +659,18 @@ tear_down_cluster(gf_boolean_t run_teardown)
|
|
|
190130 |
"Failed to close dir %s. Reason :"
|
|
|
190130 |
" %s",
|
|
|
190130 |
CONFDIR, strerror(errno));
|
|
|
190130 |
+ goto exit;
|
|
|
190130 |
}
|
|
|
190130 |
}
|
|
|
190130 |
|
|
|
190130 |
out:
|
|
|
190130 |
+ if (dir && sys_closedir(dir)) {
|
|
|
190130 |
+ gf_msg_debug(THIS->name, 0,
|
|
|
190130 |
+ "Failed to close dir %s. Reason :"
|
|
|
190130 |
+ " %s",
|
|
|
190130 |
+ CONFDIR, strerror(errno));
|
|
|
190130 |
+ }
|
|
|
190130 |
+exit:
|
|
|
190130 |
return ret;
|
|
|
190130 |
}
|
|
|
190130 |
|
|
|
190130 |
--
|
|
|
190130 |
1.8.3.1
|
|
|
190130 |
|