ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Change log level in mount_with_alternatives()" am: 34386d2d29

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

Change-Id: If9ffc952c9008f017790c6add4defcd640e7542a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-09-08 13:30:13 +00:00 • committed by Automerger Merge Worker
commit 342cfadb06
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs_mgr/fs_mgr.cpp
View file

@ -903,9 +903,9 @@ static bool mount_with_alternatives(Fstab& fstab, int start_idx, int* end_idx,
// Deal with alternate entries for the same point which are required to be all following // Deal with alternate entries for the same point which are required to be all following
// each other. // each other.
if (mounted) { if (mounted) {
LERROR << __FUNCTION__ << "(): skipping fstab dup mountpoint=" << fstab[i].mount_point LINFO << __FUNCTION__ << "(): skipping fstab dup mountpoint=" << fstab[i].mount_point
<< " rec[" << i << "].fs_type=" << fstab[i].fs_type << " already mounted as " << " rec[" << i << "].fs_type=" << fstab[i].fs_type << " already mounted as "
<< fstab[*attempted_idx].fs_type; << fstab[*attempted_idx].fs_type;
continue; continue;
} }
@ -933,9 +933,9 @@ static bool mount_with_alternatives(Fstab& fstab, int start_idx, int* end_idx,
*attempted_idx = i; *attempted_idx = i;
mounted = true; mounted = true;
if (i != start_idx) { if (i != start_idx) {
LERROR << __FUNCTION__ << "(): Mounted " << fstab[i].blk_device << " on " LINFO << __FUNCTION__ << "(): Mounted " << fstab[i].blk_device << " on "
<< fstab[i].mount_point << " with fs_type=" << fstab[i].fs_type << fstab[i].mount_point << " with fs_type=" << fstab[i].fs_type
<< " instead of " << fstab[start_idx].fs_type; << " instead of " << fstab[start_idx].fs_type;
} }
fs_stat &= ~FS_STAT_FULL_MOUNT_FAILED; fs_stat &= ~FS_STAT_FULL_MOUNT_FAILED;
mount_errno = 0; mount_errno = 0;