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

Commit 83968c53 authored by Daniel Rosenberg's avatar Daniel Rosenberg Committed by android-build-merger
Browse files

Merge "Retry mounts on -EAGAIN" am: ccb06c7b am: 4a8d70cc 

am: a4825bd6

Change-Id: I25407825bc60c9898eec952e6158d30648741f34
parents f88eddc8 a4825bd6

fs_mgr/fs_mgr.cpp

+10 −2
Original line number Diff line number Diff line
@@ -556,9 +556,17 @@ static int __mount(const std::string& source, const std::string& target, const F 
    mkdir(target.c_str(), 0755);

    errno = 0;

    unsigned long mountflags = entry.flags;

    int ret = mount(source.c_str(), target.c_str(), entry.fs_type.c_str(), mountflags,

    int ret = 0;

    int save_errno = 0;

    do {

        if (save_errno == EAGAIN) {

            PINFO << "Retrying mount (source=" << source << ",target=" << target

                  << ",type=" << entry.fs_type << ")=" << ret << "(" << save_errno << ")";

        }

        ret = mount(source.c_str(), target.c_str(), entry.fs_type.c_str(), mountflags,

                    entry.fs_options.c_str());

    int save_errno = errno;

        save_errno = errno;

    } while (ret && save_errno == EAGAIN);

    const char* target_missing = "";

    const char* source_missing = "";

    if (save_errno == ENOENT) {