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

Commit 3bfadb4d authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

Merge "init: automatically add a new loop device when there are no idle loop... 

Merge "init: automatically add a new loop device when there are no idle loop devices" am: a819eb22 am: d8992d69

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



Change-Id: I02c7a7f49be58ed72605df3ee2422d477890061d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b62e9fa d8992d69

init/builtins.cpp

+23 −21
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
#include <cutils/android_reboot.h>

#include <fs_mgr.h>

#include <fscrypt/fscrypt.h>

#include <libdm/dm.h>

#include <libdm/loop_control.h>

#include <libgsi/libgsi.h>

#include <logwrap/logwrap.h>

#include <private/android_filesystem_config.h>
@@ -506,29 +508,29 @@ static Result<void> do_mount(const BuiltinArguments& args) { 


    if (android::base::StartsWith(source, "loop@")) {

        int mode = (flags & MS_RDONLY) ? O_RDONLY : O_RDWR;

        unique_fd fd(TEMP_FAILURE_RETRY(open(source + 5, mode | O_CLOEXEC)));

        if (fd < 0) return ErrnoError() << "open(" << source + 5 << ", " << mode << ") failed";



        for (size_t n = 0;; n++) {

            std::string tmp = android::base::StringPrintf("/dev/block/loop%zu", n);

            unique_fd loop(TEMP_FAILURE_RETRY(open(tmp.c_str(), mode | O_CLOEXEC)));

            if (loop < 0) return ErrnoError() << "open(" << tmp << ", " << mode << ") failed";



            loop_info info;

            /* if it is a blank loop device */

            if (ioctl(loop.get(), LOOP_GET_STATUS, &info) < 0 && errno == ENXIO) {

                /* if it becomes our loop device */

                if (ioctl(loop.get(), LOOP_SET_FD, fd.get()) >= 0) {

                    if (mount(tmp.c_str(), target, system, flags, options) < 0) {

                        ioctl(loop.get(), LOOP_CLR_FD, 0);

                        return ErrnoError() << "mount() failed";

                    }

                    return {};

        const char* file_path = source + strlen("loop@");



        // Open source file

        if (wait) {

            wait_for_file(file_path, kCommandRetryTimeout);

        }



        unique_fd fd(TEMP_FAILURE_RETRY(open(file_path, mode | O_CLOEXEC)));

        if (fd < 0) {

            return ErrnoError() << "open(" << file_path << ", " << mode << ") failed";

        }



        // Allocate loop device and attach it to file_path.

        android::dm::LoopControl loop_control;

        std::string loop_device;

        if (!loop_control.Attach(fd.get(), 5s, &loop_device)) {

            return ErrnoError() << "loop_control.Attach " << file_path << " failed";

        }



        return Error() << "out of loopback devices";

        if (mount(loop_device.c_str(), target, system, flags, options) < 0) {

            loop_control.Detach(loop_device);

            return ErrnoError() << "mount() failed";

        }

    } else {

        if (wait)

            wait_for_file(source, kCommandRetryTimeout);