diff options
author | Jeff Sharkey <jsharkey@android.com> | 2012-09-25 15:48:04 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-25 15:48:05 -0700 |
commit | 00615f017bcc4be5a6ce02f1eeeebe59dbd381df (patch) | |
tree | 92611f412df88eb8541fed216be796293e15fdd0 | |
parent | 9481266ea360e0a8f326fec1106ea445f2ef883c (diff) | |
parent | 489609bb44fe8834c76c772f2cff8f03dbb84e08 (diff) | |
download | core-00615f017bcc4be5a6ce02f1eeeebe59dbd381df.tar.gz |
Merge "Allow mkdir() race to succeed." into jb-mr1-dev
-rw-r--r-- | libcutils/fs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libcutils/fs.c b/libcutils/fs.c index a9889b2bf..1226d447e 100644 --- a/libcutils/fs.c +++ b/libcutils/fs.c @@ -55,8 +55,10 @@ int fs_prepare_dir(const char* path, mode_t mode, uid_t uid, gid_t gid) { create: if (TEMP_FAILURE_RETRY(mkdir(path, mode)) == -1) { - ALOGE("Failed to mkdir(%s): %s", path, strerror(errno)); - return -1; + if (errno != EEXIST) { + ALOGE("Failed to mkdir(%s): %s", path, strerror(errno)); + return -1; + } } fixup: |