From faba3263b7d4c1c057ca9d1291f258860c1359a5 Mon Sep 17 00:00:00 2001 From: Yusuke Sato Date: Tue, 18 Aug 2015 12:10:45 -0700 Subject: [PATCH] Use the new version of android_fork_execvp_ext() This CL depends on I818f5cf61045286c8d64a91b6d50f05740329be1. Bug: 21725996 Change-Id: I2d26cf79989de717b7695757d0297a16dedbebbd --- puncture_fs/puncture_fs.c | 2 +- tests/fstest/recovery_test.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/puncture_fs/puncture_fs.c b/puncture_fs/puncture_fs.c index 3f7e4a72..e9d08dc0 100644 --- a/puncture_fs/puncture_fs.c +++ b/puncture_fs/puncture_fs.c @@ -187,7 +187,7 @@ static bool puncture_fs (const char * const path, const u64 total_size, free(base_file_data); rm_bin_argv[2] = delete_dir; if (android_fork_execvp_ext(ARRAY_SIZE(rm_bin_argv), rm_bin_argv, - NULL, 1, LOG_KLOG, 0, NULL) < 0) { + NULL, 1, LOG_KLOG, 0, NULL, NULL, 0) < 0) { fprintf(stderr, "\nFailed to delete %s\n", rm_bin_argv[2]); return false; } diff --git a/tests/fstest/recovery_test.cpp b/tests/fstest/recovery_test.cpp index 4121a871..f8d41c31 100644 --- a/tests/fstest/recovery_test.cpp +++ b/tests/fstest/recovery_test.cpp @@ -222,7 +222,8 @@ class FsRecoveryTest : public ::testing::Test { }; int status; return android_fork_execvp_ext(ARRAY_SIZE(umount_argv), umount_argv, - NULL, true, LOG_KLOG, false, NULL) >= 0; + NULL, true, LOG_KLOG, false, NULL, + NULL, 0) >= 0; } bool mountAll() { @@ -233,7 +234,8 @@ class FsRecoveryTest : public ::testing::Test { }; int status; return android_fork_execvp_ext(ARRAY_SIZE(mountall_argv), mountall_argv, - NULL, true, LOG_KLOG, false, NULL) >= 0; + NULL, true, LOG_KLOG, false, NULL, + NULL, 0) >= 0; } int getCacheBlkFd() { -- 2.11.0