Merge "fs_mgr: fix errno setted by mount_with_alternatives" (488525b4) · Commits · e / os / android_system_core

fs_mgr/fs_mgr.cpp

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -563,9 +563,11 @@ static int mount_with_alternatives(struct fstab fstab, int start_idx, int end_
	}		}
	} else {		} else {
	fs_stat \|= FS_STAT_FULL_MOUNT_FAILED;		fs_stat \|= FS_STAT_FULL_MOUNT_FAILED;
	/* back up errno for crypto decisions */		/* back up the first errno for crypto decisions */
			if (mount_errno == 0) {
	mount_errno = errno;		mount_errno = errno;
	}		}
			}
	log_fs_stat(fstab->recs[i].blk_device, fs_stat);		log_fs_stat(fstab->recs[i].blk_device, fs_stat);
	}		}