diff options
| author | Mihai Serban <mihai.serban@intel.com> | 2015-01-07 12:44:24 +0200 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-01-08 17:44:15 +0000 |
| commit | 04f4839594cb8ceea93b9c709bc5bba231d68ae0 (patch) | |
| tree | cb110bcd1dfe489c36c0557bdfb8dd8f1b7c78f4 /ext4_utils | |
| parent | 3701548f5d1d466f586e4d84b3e1e529c8d8cd47 (diff) | |
| download | extras-04f4839594cb8ceea93b9c709bc5bba231d68ae0.tar.gz | |
make_ext4fs: workaround for a glibc scandir bug
Due to a bug in glibc scandir the make_ext4fs tool fails sometimes
with error message:
"error: build_directory_structure: scandir: Cannot allocate memory"
A simple retry of the failed scandir in case errno is ENOMEM
greatly increases the chances to finish the operation successfully.
The scandir bug is reported here:
https://sourceware.org/bugzilla/show_bug.cgi?id=17804
Change-Id: I87fa283106c0215e4b358459022497d9ec1edb60
Signed-off-by: Mihai Serban <mihai.serban@intel.com>
Diffstat (limited to 'ext4_utils')
| -rw-r--r-- | ext4_utils/make_ext4fs.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c index 2f89ae8a..62a3f1ac 100644 --- a/ext4_utils/make_ext4fs.c +++ b/ext4_utils/make_ext4fs.c @@ -143,8 +143,18 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path if (full_path) { entries = scandir(full_path, &namelist, filter_dot, (void*)alphasort); if (entries < 0) { - error_errno("scandir"); - return EXT4_ALLOCATE_FAILED; +#ifdef __GLIBC__ + /* The scandir function implemented in glibc has a bug that makes it + erroneously fail with ENOMEM under certain circumstances. + As a workaround we can retry the scandir call with the same arguments. + GLIBC BZ: https://sourceware.org/bugzilla/show_bug.cgi?id=17804 */ + if (errno == ENOMEM) + entries = scandir(full_path, &namelist, filter_dot, (void*)alphasort); +#endif + if (entries < 0) { + error_errno("scandir"); + return EXT4_ALLOCATE_FAILED; + } } } |