From 4139298b61bceddb98d97a3734771f034411150e Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Tue, 14 Aug 2012 00:04:55 +0000 Subject: [PATCH] HDFS-3790. test_fuse_dfs.c doesn't compile on centos 5. Contributed by Colin Patrick McCabe. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372676 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop-hdfs/src/main/native/fuse-dfs/test/test_fuse_dfs.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index e146638810..a75e011c04 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -587,6 +587,9 @@ Branch-2 ( Unreleased changes ) IOExceptions of stream closures can mask root exceptions. (Uma Maheswara Rao G via szetszwo) + HDFS-3790. test_fuse_dfs.c doesn't compile on centos 5. (Colin Patrick + McCabe via atm) + BREAKDOWN OF HDFS-3042 SUBTASKS HDFS-2185. HDFS portion of ZK-based FailoverController (todd) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/test/test_fuse_dfs.c b/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/test/test_fuse_dfs.c index 3b479fbe24..f4212a6c51 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/test/test_fuse_dfs.c +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/test/test_fuse_dfs.c @@ -75,7 +75,7 @@ static int fuserMount(int *procRet, ...) { int ret, status; size_t i = 0; - char *args[64], *c, *env[] = { NULL }; + char *args[64], *c; va_list ap; pid_t pid, pret; @@ -99,7 +99,7 @@ static int fuserMount(int *procRet, ...) ret, strerror(ret)); return -ret; } else if (pid == 0) { - if (execvpe("fusermount", args, env)) { + if (execvp("fusermount", args)) { ret = errno; fprintf(stderr, "FUSE_TEST: failed to execute fusermount: " "error %d: %s\n", ret, strerror(ret));