From 0b60e7252650355f412974bfc840bc2fc81b4157 Mon Sep 17 00:00:00 2001 From: Krishnan Parthasarathi Date: Sat, 8 Sep 2012 12:12:48 +0530 Subject: glusterd: Expect setmntent(3) to return NULL - Closed the mtab FILE * using endmntent(3) Change-Id: I5e1ebb7f092abda638cfbb5524da693dcac6c872 BUG: 851109 Signed-off-by: Krishnan Parthasarathi Reviewed-on: http://review.gluster.org/3922 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- xlators/mgmt/glusterd/src/glusterd-utils.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 3593683f2..7752d35ee 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -3779,6 +3779,11 @@ glusterd_add_brick_mount_details (glusterd_brickinfo_t *brickinfo, goto out; mtab = setmntent (_PATH_MOUNTED, "r"); + if (!mtab) { + ret = -1; + goto out; + } + entry = getmntent (mtab); while (1) { @@ -3818,8 +3823,10 @@ glusterd_add_brick_mount_details (glusterd_brickinfo_t *brickinfo, ret = dict_set_dynstr (dict, key, mnt_options); out: - if (mnt_pt) - GF_FREE (mnt_pt); + GF_FREE (mnt_pt); + if (mtab) + endmntent (mtab); + return ret; } #endif -- cgit