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

Commit fd185272 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by android-build-merger
Browse files

Merge "init/reboot: call MNT_FORCE at the last umount(2)" am: 4e008547 am: eacc9cd6 

am: 647a720e

Change-Id: Idd01e0c5ff4ee5c6f0b18525c7f140b4e0d2c086
parents df0df245 647a720e

init/reboot.cpp

+7 −6
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ class MountEntry { 
          mnt_type_(entry.mnt_type),

          mnt_opts_(entry.mnt_opts) {}



    bool Umount() {

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

    bool Umount(bool force) {

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

        if (r == 0) {

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

            return true;
@@ -280,13 +280,14 @@ static UmountStat UmountPartitions(std::chrono::milliseconds timeout) { 
        bool unmount_done = true;

        if (emulated_devices.size() > 0) {

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

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

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

            if (unmount_done) {

                sync();

            }

        }

        unmount_done = std::all_of(block_devices.begin(), block_devices.end(),

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

        unmount_done =

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

                        [&timeout](auto& entry) { return entry.Umount(timeout == 0ms); }) &&

            unmount_done;

        if (unmount_done) {

            return UMOUNT_STAT_SUCCESS;