From 39fee9a8f8264df61f77563acb048a441265afcf Mon Sep 17 00:00:00 2001 From: Rajesh Amaravathi Date: Mon, 19 Sep 2011 14:25:47 +0530 Subject: glusterd: make sort portable fixed for fd leaking. reopening of file was not needed BUG: 3491 Change-Id: I1351bdcaa41a5901574f5e779c33bf6f80a938f9 Reviewed-on: http://review.gluster.com/453 Reviewed-by: Csaba Henk Tested-by: Gluster Build System --- xlators/mgmt/glusterd/src/glusterd-utils.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'xlators/mgmt/glusterd/src') diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index f519af63d87..209138acae2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -1340,24 +1340,17 @@ glusterd_volume_compute_cksum (glusterd_volinfo_t *volinfo) } /* sort the info file, result in sort_filepath */ - sort_fd = open (sort_filepath, O_WRONLY | O_CREAT, 0644); - if (sort_fd < 0) { - gf_log (THIS->name, GF_LOG_ERROR, "failed to open file %s", - sort_filepath); - goto out; - } - runinit (&runner); runner_add_args (&runner, "sort", filepath, NULL); runner_redir (&runner, STDOUT_FILENO, sort_fd); ret = runner_run (&runner); + close (sort_fd); if (ret) { gf_log (THIS->name, GF_LOG_ERROR, "failed to sort file %s to %s", filepath, sort_filepath); goto out; } - close (sort_fd); ret = get_checksum_for_path (sort_filepath, &cksum); if (ret) { -- cgit