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

Merge "Retry mounts on -EAGAIN" am: ccb06c7b2b am: 4a8d70cc8a

Browse source 
am: a4825bd6e8

Change-Id: I25407825bc60c9898eec952e6158d30648741f34
This commit is contained in:
Daniel Rosenberg 2019-01-16 20:33:12 -08:00 • committed by android-build-merger
commit 83968c53e1
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs_mgr/fs_mgr.cpp
View file

@ -556,9 +556,17 @@ static int __mount(const std::string& source, const std::string& target, const F
mkdir(target.c_str(), 0755);
errno = 0;
unsigned long mountflags = entry.flags;
int ret = mount(source.c_str(), target.c_str(), entry.fs_type.c_str(), mountflags,
int ret = 0;
int save_errno = 0;
do {
if (save_errno == EAGAIN) {
PINFO << "Retrying mount (source=" << source << ",target=" << target
<< ",type=" << entry.fs_type << ")=" << ret << "(" << save_errno << ")";
}
ret = mount(source.c_str(), target.c_str(), entry.fs_type.c_str(), mountflags,
entry.fs_options.c_str());
int save_errno = errno;
save_errno = errno;
} while (ret && save_errno == EAGAIN);
const char* target_missing = "";
const char* source_missing = "";
if (save_errno == ENOENT) {