Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 676a3b87 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Automerger Merge Worker
Browse files

Merge "logwrap_fork_execvp block recovery auto reboot" am: 85d86d0e 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2089483



Change-Id: I9278f1b6ab139358c9be8e728e35d3990c5493fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6fcba89 85d86d0e

fs_mgr/fs_mgr.cpp

+23 −17
Original line number Diff line number Diff line
@@ -266,16 +266,21 @@ static void check_fs(const std::string& blk_device, const std::string& fs_type, 
        const char* f2fs_fsck_forced_argv[] = {

                F2FS_FSCK_BIN, "-f", "-c", "10000", "--debug-cache", blk_device.c_str()};



        if (access(F2FS_FSCK_BIN, X_OK)) {

            LINFO << "Not running " << F2FS_FSCK_BIN << " on " << realpath(blk_device)

                  << " (executable not in system image)";

        } else {

            if (should_force_check(*fs_stat)) {

                LINFO << "Running " << F2FS_FSCK_BIN << " -f -c 10000 --debug-cache "

                      << realpath(blk_device);

                ret = logwrap_fork_execvp(ARRAY_SIZE(f2fs_fsck_forced_argv), f2fs_fsck_forced_argv,

                                      &status, false, LOG_KLOG | LOG_FILE, false, FSCK_LOG_FILE);

                                          &status, false, LOG_KLOG | LOG_FILE, false,

                                          FSCK_LOG_FILE);

            } else {

                LINFO << "Running " << F2FS_FSCK_BIN << " -a -c 10000 --debug-cache "

                      << realpath(blk_device);

            ret = logwrap_fork_execvp(ARRAY_SIZE(f2fs_fsck_argv), f2fs_fsck_argv, &status, false,

                                      LOG_KLOG | LOG_FILE, false, FSCK_LOG_FILE);

                ret = logwrap_fork_execvp(ARRAY_SIZE(f2fs_fsck_argv), f2fs_fsck_argv, &status,

                                          false, LOG_KLOG | LOG_FILE, false, FSCK_LOG_FILE);

            }

            if (ret < 0) {

                /* No need to check for error in fork, we can't really handle it now */
@@ -286,6 +291,7 @@ static void check_fs(const std::string& blk_device, const std::string& fs_type, 
                *fs_stat |= FS_STAT_FSCK_FS_FIXED;

            }

        }

    }

    android::base::SetProperty("ro.boottime.init.fsck." + Basename(target),

                               std::to_string(t.duration().count()));

    return;