From e4cfe5f699579e8eaebb6d0bb0f100e7d83a120b Mon Sep 17 00:00:00 2001
From: Osier Yang <jyang@redhat.com>
Date: Tue, 19 Jun 2012 16:15:27 +0800
Subject: [PATCH] storage: Set the perms if the pool target already exists for
 fs pools

The comment says:

/* Now create the final dir in the path with the uid/gid/mode
 * requested in the config. If the dir already exists, just set
 * the perms.
 */

However, virDirCreate is only invoked if the target path doesn't
exist yet (which is opposite with the comment), or the uid from
the config is not -1 (I don't understand why, think it's just
another mistake). And the result is the perms of the pool won't
be changed if one tries to build the pool with different perms
again.

Besides these logic error fix, if no uid and gid are specified in
the config, the practical used uid, gid are reflected.
---
 src/storage/storage_backend_fs.c | 42 +++++++++++++++++---------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 169037b4b9..bde4528483 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -789,30 +789,32 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED,
     /* Now create the final dir in the path with the uid/gid/mode
      * requested in the config. If the dir already exists, just set
      * the perms. */
+    uid_t uid;
+    gid_t gid;
 
-    struct stat st;
+    uid = (pool->def->target.perms.uid == (uid_t) -1)
+        ? getuid() : pool->def->target.perms.uid;
+    gid = (pool->def->target.perms.gid == (gid_t) -1)
+        ? getgid() : pool->def->target.perms.gid;
 
-    if ((stat(pool->def->target.path, &st) < 0)
-        || (pool->def->target.perms.uid != -1)) {
-
-        uid_t uid = (pool->def->target.perms.uid == -1)
-            ? getuid() : pool->def->target.perms.uid;
-        gid_t gid = (pool->def->target.perms.gid == -1)
-            ? getgid() : pool->def->target.perms.gid;
-
-        if ((err = virDirCreate(pool->def->target.path,
-                                pool->def->target.perms.mode,
-                                uid, 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)) {
-            virReportSystemError(-err, _("cannot create path '%s'"),
-                                 pool->def->target.path);
-            goto error;
-        }
+    if ((err = virDirCreate(pool->def->target.path,
+                            pool->def->target.perms.mode,
+                            uid, 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)) {
+        virReportSystemError(-err, _("cannot create path '%s'"),
+                             pool->def->target.path);
+        goto error;
     }
 
+    /* Reflect the actual uid and gid to the config. */
+    if (pool->def->target.perms.uid == (uid_t) -1)
+        pool->def->target.perms.uid = uid;
+    if (pool->def->target.perms.gid == (gid_t) -1)
+        pool->def->target.perms.gid = gid;
+
     if (flags != 0) {
         ret = virStorageBackendMakeFileSystem(pool, flags);
     } else {