Commit 80a8feec authored Dec 29, 2021 by Jaegeuk Kim Committed by Randall Huang Jan 21, 2022

[DO NOT MERGE] Don't try to mount if the disk has no FS magic



This avoids:
[   22.932529][    T1] init: [libfs_mgr]Invalid f2fs superblock on '/dev/block/platform/14700000.ufs/by-name/metadata'
[   22.934609][    T1] F2FS-fs (sda8): Magic Mismatch, valid(0xf2f52010) - read(0x0)
[   22.935061][    T1] F2FS-fs (sda8): Can't find valid F2FS filesystem in 1th superblock
[   22.937306][    T1] F2FS-fs (sda8): Magic Mismatch, valid(0xf2f52010) - read(0x0)
[   22.943700][    T1] F2FS-fs (sda8): Can't find valid F2FS filesystem in 2th superblock
[   22.951937][    T1] init: [libfs_mgr]__mount(source=/dev/block/platform/14700000.ufs/by-name/metadata,target=/metadata,type=f2fs)=-1: Invalid argument

Bug: 210589189
Bug: 214203920
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I27989b25769eae83eb06ac86146f27baf288b7e1
Merged-In: I27989b25769eae83eb06ac86146f27baf288b7e1

parent fdff9a34

fs_mgr/fs_mgr.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -1882,9 +1882,13 @@ int fs_mgr_do_mount_one(const FstabEntry& entry, const std::string& alt_mount_po
		auto& mount_point = alt_mount_point.empty() ? entry.mount_point : alt_mount_point;

		// Run fsck if needed
		prepare_fs_for_mount(entry.blk_device, entry, mount_point);
		int ret = prepare_fs_for_mount(entry.blk_device, entry, mount_point);
		// Wiped case doesn't require to try __mount below.
		if (ret & FS_STAT_INVALID_MAGIC) {
		return FS_MGR_DOMNT_FAILED;
		}

		int ret = __mount(entry.blk_device, mount_point, entry);
		ret = __mount(entry.blk_device, mount_point, entry);
		if (ret) {
		ret = (errno == EBUSY) ? FS_MGR_DOMNT_BUSY : FS_MGR_DOMNT_FAILED;
		}