External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

storage: fs: Don't attempt directory creation if it already exists

Browse Source 
The current code attempts to handle this, but it only catches mkdir
failing with EEXIST. However if say trying to build /tmp for an
unprivileged qemu:///session, mkdir will fail with EPERM.

Rather than catch any errors, just don't attempt mkdir if the directory
already exists.
This commit is contained in:
Cole Robinson 2015-04-27 16:48:05 -04:00
parent d6f8b35db5
commit 262b3c05dd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/virfile.c
View File

@ -2289,12 +2289,13 @@ virDirCreateNoFork(const char *path,
int ret = 0; int ret = 0;
struct stat st; struct stat st;
if ((mkdir(path, mode) < 0) if (!((flags & VIR_DIR_CREATE_ALLOW_EXIST) && !virFileExists(path))) {
&& !((errno == EEXIST) && (flags & VIR_DIR_CREATE_ALLOW_EXIST))) { if (mkdir(path, mode) < 0) {
ret = -errno; ret = -errno;
virReportSystemError(errno, _("failed to create directory '%s'"), virReportSystemError(errno, _("failed to create directory '%s'"),
path); path);
goto error; goto error;
}
} }
if (stat(path, &st) == -1) { if (stat(path, &st) == -1) {