diff options
| author | Xin Li <delphij@google.com> | 2017-11-14 12:12:57 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2017-11-14 13:19:45 -0800 |
| commit | 23e27db576d06761363365494327baf062468a66 (patch) | |
| tree | cc76a40025c2189fc70dd6edd4a0eba251fd7b44 /fs_mgr | |
| parent | ea41bcf7a3a9095feb39cc6bd37d865c2eec3c36 (diff) | |
| parent | a63ccea6abc7ea02e2d98e41c80793ca97237bd3 (diff) | |
| download | system_core-23e27db576d06761363365494327baf062468a66.tar.gz system_core-23e27db576d06761363365494327baf062468a66.tar.bz2 system_core-23e27db576d06761363365494327baf062468a66.zip | |
Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from
oc-mr1-dev-plus-aosp into stage-aosp-master
Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40
Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr_format.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs_mgr/fs_mgr_format.cpp b/fs_mgr/fs_mgr_format.cpp index 75feee798..fc88217ce 100644 --- a/fs_mgr/fs_mgr_format.cpp +++ b/fs_mgr/fs_mgr_format.cpp @@ -38,7 +38,6 @@ static int format_ext4(char *fs_blkdev, char *fs_mnt_point, bool crypt_footer) { uint64_t dev_sz; int fd, rc = 0; - int status; if ((fd = open(fs_blkdev, O_WRONLY)) < 0) { PERROR << "Cannot open block device"; @@ -62,7 +61,7 @@ static int format_ext4(char *fs_blkdev, char *fs_mnt_point, bool crypt_footer) const char* const mke2fs_args[] = { "/system/bin/mke2fs", "-t", "ext4", "-b", "4096", fs_blkdev, size_str.c_str(), nullptr}; - rc = android_fork_execvp_ext(arraysize(mke2fs_args), const_cast<char**>(mke2fs_args), &status, + rc = android_fork_execvp_ext(arraysize(mke2fs_args), const_cast<char**>(mke2fs_args), NULL, true, LOG_KLOG, true, nullptr, nullptr, 0); if (rc) { LERROR << "mke2fs returned " << rc; @@ -78,7 +77,7 @@ static int format_ext4(char *fs_blkdev, char *fs_mnt_point, bool crypt_footer) nullptr}; rc = android_fork_execvp_ext(arraysize(e2fsdroid_args), const_cast<char**>(e2fsdroid_args), - &status, true, LOG_KLOG, true, nullptr, nullptr, 0); + NULL, true, LOG_KLOG, true, nullptr, nullptr, 0); if (rc) { LERROR << "e2fsdroid returned " << rc; } @@ -88,10 +87,9 @@ static int format_ext4(char *fs_blkdev, char *fs_mnt_point, bool crypt_footer) static int format_f2fs(char *fs_blkdev) { - int status; const char* const args[] = {"/system/bin/make_f2fs", "-f", "-O encrypt", fs_blkdev, nullptr}; - return android_fork_execvp_ext(arraysize(args), const_cast<char**>(args), &status, true, + return android_fork_execvp_ext(arraysize(args), const_cast<char**>(args), NULL, true, LOG_KLOG, true, nullptr, nullptr, 0); } |