diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-07 23:02:37 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-07 23:02:37 +0000 |
commit | 2166b890460a0f463bf094dfb5432d598f84df5d (patch) | |
tree | a409f21894f69e06a2e399bde1755fa528417a21 | |
parent | ccd8f529e8d6175ec5633b87b5759267f2a61e7f (diff) | |
parent | 7a6e6204470e81c15a534cc0cac47939a1b3b1bc (diff) | |
download | core-2166b890460a0f463bf094dfb5432d598f84df5d.tar.gz |
Snap for 6746904 from 7a6e6204470e81c15a534cc0cac47939a1b3b1bc to rvc-qpr1-release
Change-Id: I59cf01a19be04999f631ca83ff539dbdb74c69b6
-rw-r--r-- | fs_mgr/fs_mgr.cpp | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index 956147198..30db652ed 100644 --- a/fs_mgr/fs_mgr.cpp +++ b/fs_mgr/fs_mgr.cpp @@ -301,13 +301,10 @@ static bool is_ext4_superblock_valid(const struct ext4_super_block* es) { return true; } -static bool needs_block_encryption(const FstabEntry& entry); -static bool should_use_metadata_encryption(const FstabEntry& entry); - // Read the primary superblock from an ext4 filesystem. On failure return // false. If it's not an ext4 filesystem, also set FS_STAT_INVALID_MAGIC. -static bool read_ext4_superblock(const std::string& blk_device, const FstabEntry& entry, - struct ext4_super_block* sb, int* fs_stat) { +static bool read_ext4_superblock(const std::string& blk_device, struct ext4_super_block* sb, + int* fs_stat) { android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(blk_device.c_str(), O_RDONLY | O_CLOEXEC))); if (fd < 0) { @@ -324,29 +321,7 @@ static bool read_ext4_superblock(const std::string& blk_device, const FstabEntry LINFO << "Invalid ext4 superblock on '" << blk_device << "'"; // not a valid fs, tune2fs, fsck, and mount will all fail. *fs_stat |= FS_STAT_INVALID_MAGIC; - - bool encrypted = should_use_metadata_encryption(entry) || needs_block_encryption(entry); - if (entry.mount_point == "/data" && - (!encrypted || android::base::StartsWith(blk_device, "/dev/block/dm-"))) { - // try backup superblock, if main superblock is corrupted - for (unsigned int blocksize = EXT4_MIN_BLOCK_SIZE; blocksize <= EXT4_MAX_BLOCK_SIZE; - blocksize *= 2) { - uint64_t superblock = blocksize * 8; - if (blocksize == EXT4_MIN_BLOCK_SIZE) superblock++; - - if (TEMP_FAILURE_RETRY(pread(fd, sb, sizeof(*sb), superblock * blocksize)) != - sizeof(*sb)) { - PERROR << "Can't read '" << blk_device << "' superblock"; - return false; - } - if (is_ext4_superblock_valid(sb) && - (1 << (10 + sb->s_log_block_size) == blocksize)) { - *fs_stat &= ~FS_STAT_INVALID_MAGIC; - break; - } - } - } - if (*fs_stat & FS_STAT_INVALID_MAGIC) return false; + return false; } *fs_stat |= FS_STAT_IS_EXT4; LINFO << "superblock s_max_mnt_count:" << sb->s_max_mnt_count << "," << blk_device; @@ -688,7 +663,7 @@ static int prepare_fs_for_mount(const std::string& blk_device, const FstabEntry& if (is_extfs(entry.fs_type)) { struct ext4_super_block sb; - if (read_ext4_superblock(blk_device, entry, &sb, &fs_stat)) { + if (read_ext4_superblock(blk_device, &sb, &fs_stat)) { if ((sb.s_feature_incompat & EXT4_FEATURE_INCOMPAT_RECOVER) != 0 || (sb.s_state & EXT4_VALID_FS) == 0) { LINFO << "Filesystem on " << blk_device << " was not cleanly shutdown; " @@ -718,7 +693,7 @@ static int prepare_fs_for_mount(const std::string& blk_device, const FstabEntry& entry.fs_mgr_flags.fs_verity || entry.fs_mgr_flags.ext_meta_csum)) { struct ext4_super_block sb; - if (read_ext4_superblock(blk_device, entry, &sb, &fs_stat)) { + if (read_ext4_superblock(blk_device, &sb, &fs_stat)) { tune_reserved_size(blk_device, entry, &sb, &fs_stat); tune_encrypt(blk_device, entry, &sb, &fs_stat); tune_verity(blk_device, entry, &sb, &fs_stat); |