diff options
| author | Yusuke Sato <yusukes@google.com> | 2015-08-19 22:31:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 22:31:08 +0000 |
| commit | 2ef82cffad897bc16dc1bde1763bf99875da6cbb (patch) | |
| tree | 2355c5e64ea64c25c5f3107afe02267d0365086b /fs_mgr | |
| parent | 22b510adc53787e580c591f27613ce0a7f7e7c29 (diff) | |
| parent | d1b11a04903be74ba6a47307d8c3ef2731e3f4ab (diff) | |
| download | core-2ef82cffad897bc16dc1bde1763bf99875da6cbb.tar.gz core-2ef82cffad897bc16dc1bde1763bf99875da6cbb.tar.bz2 core-2ef82cffad897bc16dc1bde1763bf99875da6cbb.zip | |
am d1b11a04: am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext"
* commit 'd1b11a04903be74ba6a47307d8c3ef2731e3f4ab':
Add |opts| argument to android_fork_execvp_ext
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 00961c5fb..c47a58591 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -154,8 +154,8 @@ static void check_fs(char *blk_device, char *fs_type, char *target) INFO("Running %s on %s\n", E2FSCK_BIN, blk_device); ret = android_fork_execvp_ext(ARRAY_SIZE(e2fsck_argv), e2fsck_argv, - &status, true, LOG_KLOG | LOG_FILE, - true, FSCK_LOG_FILE); + &status, true, LOG_KLOG | LOG_FILE, + true, FSCK_LOG_FILE, NULL, 0); if (ret < 0) { /* No need to check for error in fork, we can't really handle it now */ @@ -172,7 +172,7 @@ static void check_fs(char *blk_device, char *fs_type, char *target) ret = android_fork_execvp_ext(ARRAY_SIZE(f2fs_fsck_argv), f2fs_fsck_argv, &status, true, LOG_KLOG | LOG_FILE, - true, FSCK_LOG_FILE); + true, FSCK_LOG_FILE, NULL, 0); if (ret < 0) { /* No need to check for error in fork, we can't really handle it now */ ERROR("Failed trying to run %s\n", F2FS_FSCK_BIN); @@ -828,7 +828,8 @@ int fs_mgr_swapon_all(struct fstab *fstab) /* Initialize the swap area */ mkswap_argv[1] = fstab->recs[i].blk_device; err = android_fork_execvp_ext(ARRAY_SIZE(mkswap_argv), mkswap_argv, - &status, true, LOG_KLOG, false, NULL); + &status, true, LOG_KLOG, false, NULL, + NULL, 0); if (err) { ERROR("mkswap failed for %s\n", fstab->recs[i].blk_device); ret = -1; |