summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorKrishnan Parthasarathi <kparthas@redhat.com>2012-09-08 12:12:48 +0530
committerAnand Avati <avati@redhat.com>2012-09-09 10:41:45 -0700
commit3db3f32f747bd095dfcbb7e235fabb84a515e748 (patch)
tree651e88d92215ad5fb9b539b72e8f856257579b91 /xlators
parent39b803a434536430388cc586d1733b0ecdb212da (diff)
glusterd: Expect setmntent(3) to return NULL
- Closed the mtab FILE * using endmntent(3) Change-Id: I5e1ebb7f092abda638cfbb5524da693dcac6c872 BUG: 851109 Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 91124583459..458605c9651 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -3785,6 +3785,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) {
@@ -3824,8 +3829,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