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

Commit bce0c15f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Bugfix]Fix userspace-reboot failure when backing_dev exists but zram... 

Merge "[Bugfix]Fix userspace-reboot failure when backing_dev exists but zram not swapped on" am: 23a50b38

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

Change-Id: I76c0637965f95c9d3027c4bfc89ac0b9cbb3f384
parents c7a2eb63 23a50b38

init/reboot.cpp

+15 −3
Original line number Original line Diff line number Diff line
@@ -453,7 +453,19 @@ static UmountStat TryUmountAndFsck(unsigned int cmd, bool run_fsck, 
#define ZRAM_DEVICE       "/dev/block/zram0"

#define ZRAM_DEVICE       "/dev/block/zram0"

#define ZRAM_RESET        "/sys/block/zram0/reset"

#define ZRAM_RESET        "/sys/block/zram0/reset"

#define ZRAM_BACK_DEV     "/sys/block/zram0/backing_dev"

#define ZRAM_BACK_DEV     "/sys/block/zram0/backing_dev"

#define ZRAM_INITSTATE    "/sys/block/zram0/initstate"

static Result<void> KillZramBackingDevice() {

static Result<void> KillZramBackingDevice() {

    std::string zram_initstate;

    if (!android::base::ReadFileToString(ZRAM_INITSTATE, &zram_initstate)) {

        return ErrnoError() << "Failed to read " << ZRAM_INITSTATE;

    }



    zram_initstate.erase(zram_initstate.length() - 1);

    if (zram_initstate == "0") {

        LOG(INFO) << "Zram has not been swapped on";

        return {};

    }



    if (access(ZRAM_BACK_DEV, F_OK) != 0 && errno == ENOENT) {

    if (access(ZRAM_BACK_DEV, F_OK) != 0 && errno == ENOENT) {

        LOG(INFO) << "No zram backing device configured";

        LOG(INFO) << "No zram backing device configured";

        return {};

        return {};