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

Commit 04855184 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6601700 from 709d5692 to rvc-release 

Change-Id: Icaf301453f8d3913bb124722148edd9c4ccbc6c0
parents 46876aa9 709d5692

fs_mgr/fs_mgr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static bool read_ext4_superblock(const std::string& blk_device, const FstabEntry 
            // try backup superblock, if main superblock is corrupted

            for (unsigned int blocksize = EXT4_MIN_BLOCK_SIZE; blocksize <= EXT4_MAX_BLOCK_SIZE;

                 blocksize *= 2) {

                unsigned int superblock = blocksize * 8;

                uint64_t superblock = blocksize * 8;

                if (blocksize == EXT4_MIN_BLOCK_SIZE) superblock++;



                if (TEMP_FAILURE_RETRY(pread(fd, sb, sizeof(*sb), superblock * blocksize)) !=

liblog/pmsg_reader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int PmsgRead(struct logger_list* logger_list, struct log_msg* log_msg) { 
          ((logger_list->start.tv_sec != buf.l.realtime.tv_sec) ||

           (logger_list->start.tv_nsec <= buf.l.realtime.tv_nsec)))) &&

        (!logger_list->pid || (logger_list->pid == buf.p.pid))) {

      char* msg = reinterpret_cast<char*>(&log_msg->entry) + log_msg->entry.hdr_size;

      char* msg = reinterpret_cast<char*>(&log_msg->entry) + sizeof(log_msg->entry);

      *msg = buf.prio;

      fd = atomic_load(&logger_list->fd);

      if (fd <= 0) {