virfile: virDirCreate: Drop redundant FORCE_PERMS flag

The only two virDirCreate callers already use it

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 9d84a3880c1b4780d18c7f56ecb5df895a7c95f6..235ab204b5eb3e29117a64bd4c434aa4f098cee9 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -804,7 +804,6 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED,
                             pool->def->target.perms.mode,
                             pool->def->target.perms.uid,
                             pool->def->target.perms.gid,
-                            VIR_DIR_CREATE_FORCE_PERMS |
                             VIR_DIR_CREATE_ALLOW_EXIST |
                             (pool->def->type == VIR_STORAGE_POOL_NETFS
                             ? VIR_DIR_CREATE_AS_UID : 0))) < 0) {
@@ -1075,7 +1074,6 @@ static int createFileDir(virConnectPtr conn ATTRIBUTE_UNUSED,
     if ((err = virDirCreate(vol->target.path, vol->target.perms->mode,
                             vol->target.perms->uid,
                             vol->target.perms->gid,
-                            VIR_DIR_CREATE_FORCE_PERMS |
                             (pool->def->type == VIR_STORAGE_POOL_NETFS
                              ? VIR_DIR_CREATE_AS_UID : 0))) < 0) {
         return -1;

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 6e9ecbe6ceaf552e7352a58c7ca2bd42f3e0338c..63eafdffc8d653fa91793d20bdbd9b80137bf2ab 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -2311,8 +2311,7 @@ virDirCreateNoFork(const char *path,
                              path, (unsigned int) uid, (unsigned int) gid);
         goto error;
     }
-    if ((flags & VIR_DIR_CREATE_FORCE_PERMS)
-        && (chmod(path, mode) < 0)) {
+    if (chmod(path, mode) < 0) {
         ret = -errno;
         virReportSystemError(errno,
                              _("cannot set mode of '%s' to %04o"),
@@ -2425,8 +2424,7 @@ virDirCreate(const char *path,
                              path, (unsigned int) gid);
         goto childerror;
     }
-    if ((flags & VIR_DIR_CREATE_FORCE_PERMS)
-        && chmod(path, mode) < 0) {
+    if (chmod(path, mode) < 0) {
         virReportSystemError(errno,
                              _("cannot set mode of '%s' to %04o"),
                              path, mode);

diff --git a/src/util/virfile.h b/src/util/virfile.h
index 403d0ba7c329a0215f60acdf79824bf0adb8b37f..2d27e899b62e443702564bde992a98252d8a0e89 100644 (file)
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -223,8 +223,7 @@ int virFileOpenAs(const char *path, int openflags, mode_t mode,
 enum {
     VIR_DIR_CREATE_NONE        = 0,
     VIR_DIR_CREATE_AS_UID      = (1 << 0),
-    VIR_DIR_CREATE_FORCE_PERMS = (1 << 1),
-    VIR_DIR_CREATE_ALLOW_EXIST = (1 << 2),
+    VIR_DIR_CREATE_ALLOW_EXIST = (1 << 1),
 };
 int virDirCreate(const char *path, mode_t mode, uid_t uid, gid_t gid,
                  unsigned int flags) ATTRIBUTE_RETURN_CHECK;