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

Commit bf141af6 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

init/reboot: call MNT_FORCE at the last umount(2) 



The last one will avoid errors=panic in ext4.

Bug: 63981945
Bug: 65481582
Change-Id: I9c86afcce441767e24fc43668ab1ff6230155a9f
Merged-In: I9c86afcce441767e24fc43668ab1ff6230155a9f
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@google.com>
(cherry picked from commit 0f04f72c)
parent 924045b6

init/reboot.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -84,8 +84,8 @@ class MountEntry { 
          mnt_type_(entry.mnt_type),

          mnt_type_(entry.mnt_type),

          mnt_opts_(entry.mnt_opts) {}

          mnt_opts_(entry.mnt_opts) {}





    bool Umount() {

    bool Umount(bool force) {

        int r = umount2(mnt_dir_.c_str(), 0);

        int r = umount2(mnt_dir_.c_str(), force ? MNT_FORCE : 0);

        if (r == 0) {

        if (r == 0) {

            LOG(INFO) << "umounted " << mnt_fsname_ << ":" << mnt_dir_ << " opts " << mnt_opts_;

            LOG(INFO) << "umounted " << mnt_fsname_ << ":" << mnt_dir_ << " opts " << mnt_opts_;

            return true;

            return true;
@@ -287,11 +287,11 @@ static UmountStat UmountPartitions(std::chrono::milliseconds timeout) { 
        }

        }

        if (emulated_devices.size() > 0 &&

        if (emulated_devices.size() > 0 &&

            std::all_of(emulated_devices.begin(), emulated_devices.end(),

            std::all_of(emulated_devices.begin(), emulated_devices.end(),

                        [](auto& entry) { return entry.Umount(); })) {

                        [](auto& entry) { return entry.Umount(false); })) {

            sync();

            sync();

        }

        }

        for (auto& entry : block_devices) {

        for (auto& entry : block_devices) {

            entry.Umount();

            entry.Umount(timeout == 0ms);

        }

        }

        retry++;

        retry++;

        std::this_thread::sleep_for(100ms);

        std::this_thread::sleep_for(100ms);