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

Commit 33e4c94a authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

resolve merge conflicts of fc9c87b2 to pi-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ibc3bf7eed3aa7b9a09df69a2a8f02b839d4855ac
parents c6dbacd5 fc9c87b2

fs_mgr/fs_mgr_format.cpp

+12 −3
Original line number Diff line number Diff line
@@ -114,10 +114,19 @@ static int format_f2fs(char *fs_blkdev, uint64_t dev_sz, bool crypt_footer) 
    }



    std::string size_str = std::to_string(dev_sz / 4096);

    // clang-format off

    const char* const args[] = {

        "/system/bin/make_f2fs", "-d1", "-f",

        "-O", "encrypt", "-O", "quota",

        fs_blkdev, size_str.c_str(), nullptr};

        "/system/bin/make_f2fs",

        "-d1",

        "-f",

        "-O", "encrypt",

        "-O", "quota",

        "-w", "4096",

        fs_blkdev,

        size_str.c_str(),

        nullptr

    };

    // clang-format on



    return android_fork_execvp_ext(arraysize(args), const_cast<char**>(args), NULL, true,

                                   LOG_KLOG, true, nullptr, nullptr, 0);