提交 746a18db 编写于 作者: J John Ferlan

storage: Use virStoragePoolObjGetDef accessor for Gluster backend

In preparation for privatizing the object, use the accessor.
上级 759fbdd0
...@@ -74,8 +74,9 @@ static virStorageBackendGlusterStatePtr ...@@ -74,8 +74,9 @@ static virStorageBackendGlusterStatePtr
virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) virStorageBackendGlusterOpen(virStoragePoolObjPtr pool)
{ {
virStorageBackendGlusterStatePtr ret = NULL; virStorageBackendGlusterStatePtr ret = NULL;
const char *name = pool->def->source.name; virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
const char *dir = pool->def->source.dir; const char *name = def->source.name;
const char *dir = def->source.dir;
bool trailing_slash = true; bool trailing_slash = true;
/* Volume name must not contain '/'; optional path allows use of a /* Volume name must not contain '/'; optional path allows use of a
...@@ -112,11 +113,11 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) ...@@ -112,11 +113,11 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool)
goto error; goto error;
if (VIR_STRDUP(ret->uri->scheme, "gluster") < 0) if (VIR_STRDUP(ret->uri->scheme, "gluster") < 0)
goto error; goto error;
if (VIR_STRDUP(ret->uri->server, pool->def->source.hosts[0].name) < 0) if (VIR_STRDUP(ret->uri->server, def->source.hosts[0].name) < 0)
goto error; goto error;
if (virAsprintf(&ret->uri->path, "/%s%s", ret->volname, ret->dir) < 0) if (virAsprintf(&ret->uri->path, "/%s%s", ret->volname, ret->dir) < 0)
goto error; goto error;
ret->uri->port = pool->def->source.hosts[0].port; ret->uri->port = def->source.hosts[0].port;
/* Actually connect to glfs */ /* Actually connect to glfs */
if (!(ret->vol = glfs_new(ret->volname))) { if (!(ret->vol = glfs_new(ret->volname))) {
...@@ -343,6 +344,7 @@ virStorageBackendGlusterRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -343,6 +344,7 @@ virStorageBackendGlusterRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
virStoragePoolObjPtr pool) virStoragePoolObjPtr pool)
{ {
int ret = -1; int ret = -1;
virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
virStorageBackendGlusterStatePtr state = NULL; virStorageBackendGlusterStatePtr state = NULL;
struct { struct {
struct dirent ent; struct dirent ent;
...@@ -401,11 +403,11 @@ virStorageBackendGlusterRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -401,11 +403,11 @@ virStorageBackendGlusterRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
goto cleanup; goto cleanup;
} }
pool->def->capacity = ((unsigned long long)sb.f_frsize * def->capacity = ((unsigned long long)sb.f_frsize *
(unsigned long long)sb.f_blocks); (unsigned long long)sb.f_blocks);
pool->def->available = ((unsigned long long)sb.f_bfree * def->available = ((unsigned long long)sb.f_bfree *
(unsigned long long)sb.f_frsize); (unsigned long long)sb.f_frsize);
pool->def->allocation = pool->def->capacity - pool->def->available; def->allocation = def->capacity - def->available;
ret = 0; ret = 0;
cleanup: cleanup:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册