Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 f4981ebf 编写于 作者: W Wido den Hollander 提交者： John Ferlan
浏览文件
操作

rbd: Code styling cleanup 

Through the years the RBD storage pool code hasn't maintained the
same or correct coding standard which applies to libvirt.

This patch doesn't change any logic in the code, it only applies
the proper coding standards to the code where possible without
making large changes.

This way the code style used in this storage pool is consistent
throughout the whole file.
Signed-off-by: NWido den Hollander <wido@widodh.nl>
上级 a3b168d0
隐藏空白更改
内联 并排
Showing with 53 addition and 55 deletion
src/storage/storage_backend_rbd.c
浏览文件 @ f4981ebf
...@@ -49,9 +49,10 @@ struct _virStorageBackendRBDState { ...@@ -49,9 +49,10 @@ struct _virStorageBackendRBDState {
typedef struct _virStorageBackendRBDState virStorageBackendRBDState; typedef struct _virStorageBackendRBDState virStorageBackendRBDState;
typedef virStorageBackendRBDState *virStorageBackendRBDStatePtr; typedef virStorageBackendRBDState *virStorageBackendRBDStatePtr;
static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, static int
virConnectPtr conn, virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
virStoragePoolSourcePtr source) virConnectPtr conn,
virStoragePoolSourcePtr source)
{ {
int ret = -1; int ret = -1;
int r = 0; int r = 0;
...@@ -71,8 +72,8 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, ...@@ -71,8 +72,8 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
if (authdef) { if (authdef) {
VIR_DEBUG("Using cephx authorization, username: %s", authdef->username); VIR_DEBUG("Using cephx authorization, username: %s", authdef->username);
r = rados_create(&ptr->cluster, authdef->username);
if (r < 0) { if ((r = rados_create(&ptr->cluster, authdef->username)) < 0) {
virReportSystemError(-r, "%s", _("failed to initialize RADOS")); virReportSystemError(-r, "%s", _("failed to initialize RADOS"));
goto cleanup; goto cleanup;
} }
...@@ -222,8 +223,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, ...@@ -222,8 +223,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
rados_conf_set(ptr->cluster, "rbd_default_format", rbd_default_format); rados_conf_set(ptr->cluster, "rbd_default_format", rbd_default_format);
ptr->starttime = time(0); ptr->starttime = time(0);
r = rados_connect(ptr->cluster); if ((r = rados_connect(ptr->cluster)) < 0) {
if (r < 0) {
virReportSystemError(-r, _("failed to connect to the RADOS monitor on: %s"), virReportSystemError(-r, _("failed to connect to the RADOS monitor on: %s"),
mon_buff); mon_buff);
goto cleanup; goto cleanup;
...@@ -242,7 +242,9 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, ...@@ -242,7 +242,9 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
return ret; return ret;
} }
static int virStorageBackendRBDOpenIoCTX(virStorageBackendRBDStatePtr ptr, virStoragePoolObjPtr pool) static int
virStorageBackendRBDOpenIoCTX(virStorageBackendRBDStatePtr ptr,
virStoragePoolObjPtr pool)
{ {
int r = rados_ioctx_create(ptr->cluster, pool->def->source.name, &ptr->ioctx); int r = rados_ioctx_create(ptr->cluster, pool->def->source.name, &ptr->ioctx);
if (r < 0) { if (r < 0) {
...@@ -252,7 +254,8 @@ static int virStorageBackendRBDOpenIoCTX(virStorageBackendRBDStatePtr ptr, virSt ...@@ -252,7 +254,8 @@ static int virStorageBackendRBDOpenIoCTX(virStorageBackendRBDStatePtr ptr, virSt
return r; return r;
} }
static int virStorageBackendRBDCloseRADOSConn(virStorageBackendRBDStatePtr ptr) static int
virStorageBackendRBDCloseRADOSConn(virStorageBackendRBDStatePtr ptr)
{ {
int ret = 0; int ret = 0;
...@@ -276,25 +279,24 @@ static int virStorageBackendRBDCloseRADOSConn(virStorageBackendRBDStatePtr ptr) ...@@ -276,25 +279,24 @@ static int virStorageBackendRBDCloseRADOSConn(virStorageBackendRBDStatePtr ptr)
return ret; return ret;
} }
static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, static int
virStoragePoolObjPtr pool, volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol,
virStorageBackendRBDStatePtr ptr) virStoragePoolObjPtr pool,
virStorageBackendRBDStatePtr ptr)
{ {
int ret = -1; int ret = -1;
int r = 0; int r = 0;
rbd_image_t image = NULL; rbd_image_t image = NULL;
rbd_image_info_t info;
r = rbd_open_read_only(ptr->ioctx, vol->name, &image, NULL); if ((r = rbd_open_read_only(ptr->ioctx, vol->name, &image, NULL)) < 0) {
if (r < 0) {
ret = -r; ret = -r;
virReportSystemError(-r, _("failed to open the RBD image '%s'"), virReportSystemError(-r, _("failed to open the RBD image '%s'"),
vol->name); vol->name);
goto cleanup; goto cleanup;
} }
rbd_image_info_t info; if ((r = rbd_stat(image, &info, sizeof(info))) < 0) {
r = rbd_stat(image, &info, sizeof(info));
if (r < 0) {
ret = -r; ret = -r;
virReportSystemError(-r, _("failed to stat the RBD image '%s'"), virReportSystemError(-r, _("failed to stat the RBD image '%s'"),
vol->name); vol->name);
...@@ -331,8 +333,9 @@ static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, ...@@ -331,8 +333,9 @@ static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol,
return ret; return ret;
} }
static int virStorageBackendRBDRefreshPool(virConnectPtr conn, static int
virStoragePoolObjPtr pool) virStorageBackendRBDRefreshPool(virConnectPtr conn,
virStoragePoolObjPtr pool)
{ {
size_t max_size = 1024; size_t max_size = 1024;
int ret = -1; int ret = -1;
...@@ -342,6 +345,8 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, ...@@ -342,6 +345,8 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn,
virStorageBackendRBDState ptr; virStorageBackendRBDState ptr;
ptr.cluster = NULL; ptr.cluster = NULL;
ptr.ioctx = NULL; ptr.ioctx = NULL;
struct rados_cluster_stat_t clusterstat;
struct rados_pool_stat_t poolstat;
if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0)
goto cleanup; goto cleanup;
...@@ -349,16 +354,12 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, ...@@ -349,16 +354,12 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn,
if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0)
goto cleanup; goto cleanup;
struct rados_cluster_stat_t clusterstat; if ((r = rados_cluster_stat(ptr.cluster, &clusterstat)) < 0) {
r = rados_cluster_stat(ptr.cluster, &clusterstat);
if (r < 0) {
virReportSystemError(-r, "%s", _("failed to stat the RADOS cluster")); virReportSystemError(-r, "%s", _("failed to stat the RADOS cluster"));
goto cleanup; goto cleanup;
} }
struct rados_pool_stat_t poolstat; if ((r = rados_ioctx_pool_stat(ptr.ioctx, &poolstat)) < 0) {
r = rados_ioctx_pool_stat(ptr.ioctx, &poolstat);
if (r < 0) {
virReportSystemError(-r, _("failed to stat the RADOS pool '%s'"), virReportSystemError(-r, _("failed to stat the RADOS pool '%s'"),
pool->def->source.name); pool->def->source.name);
goto cleanup; goto cleanup;
...@@ -440,9 +441,10 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, ...@@ -440,9 +441,10 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn,
return ret; return ret;
} }
static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, static int
virStoragePoolSourcePtr source, virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx,
virStorageVolDefPtr vol) virStoragePoolSourcePtr source,
virStorageVolDefPtr vol)
{ {
int ret = -1; int ret = -1;
int r = 0; int r = 0;
...@@ -452,8 +454,7 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, ...@@ -452,8 +454,7 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx,
rbd_snap_info_t *snaps = NULL; rbd_snap_info_t *snaps = NULL;
rbd_image_t image = NULL; rbd_image_t image = NULL;
r = rbd_open(ioctx, vol->name, &image, NULL); if ((r = rbd_open(ioctx, vol->name, &image, NULL)) < 0) {
if (r < 0) {
virReportSystemError(-r, _("failed to open the RBD image '%s'"), virReportSystemError(-r, _("failed to open the RBD image '%s'"),
vol->name); vol->name);
goto cleanup; goto cleanup;
...@@ -474,8 +475,7 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, ...@@ -474,8 +475,7 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx,
if (snap_count > 0) { if (snap_count > 0) {
for (i = 0; i < snap_count; i++) { for (i = 0; i < snap_count; i++) {
r = rbd_snap_is_protected(image, snaps[i].name, &protected); if ((r = rbd_snap_is_protected(image, snaps[i].name, &protected)) < 0) {
if (r < 0) {
virReportSystemError(-r, _("failed to verify if snapshot '%s/%s@%s' is protected"), virReportSystemError(-r, _("failed to verify if snapshot '%s/%s@%s' is protected"),
source->name, vol->name, source->name, vol->name,
snaps[i].name); snaps[i].name);
...@@ -487,8 +487,7 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, ...@@ -487,8 +487,7 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx,
"unprotected", source->name, vol->name, "unprotected", source->name, vol->name,
snaps[i].name); snaps[i].name);
r = rbd_snap_unprotect(image, snaps[i].name); if ((r = rbd_snap_unprotect(image, snaps[i].name)) < 0) {
if (r < 0) {
virReportSystemError(-r, _("failed to unprotect snapshot '%s/%s@%s'"), virReportSystemError(-r, _("failed to unprotect snapshot '%s/%s@%s'"),
source->name, vol->name, source->name, vol->name,
snaps[i].name); snaps[i].name);
...@@ -499,8 +498,7 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, ...@@ -499,8 +498,7 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx,
VIR_DEBUG("Removing snapshot %s/%s@%s", source->name, VIR_DEBUG("Removing snapshot %s/%s@%s", source->name,
vol->name, snaps[i].name); vol->name, snaps[i].name);
r = rbd_snap_remove(image, snaps[i].name); if ((r = rbd_snap_remove(image, snaps[i].name)) < 0) {
if (r < 0) {
virReportSystemError(-r, _("failed to remove snapshot '%s/%s@%s'"), virReportSystemError(-r, _("failed to remove snapshot '%s/%s@%s'"),
source->name, vol->name, source->name, vol->name,
snaps[i].name); snaps[i].name);
...@@ -523,10 +521,11 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, ...@@ -523,10 +521,11 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx,
return ret; return ret;
} }
static int virStorageBackendRBDDeleteVol(virConnectPtr conn, static int
virStoragePoolObjPtr pool, virStorageBackendRBDDeleteVol(virConnectPtr conn,
virStorageVolDefPtr vol, virStoragePoolObjPtr pool,
unsigned int flags) virStorageVolDefPtr vol,
unsigned int flags)
{ {
int ret = -1; int ret = -1;
int r = 0; int r = 0;
...@@ -648,9 +647,8 @@ virStorageBackendRBDBuildVol(virConnectPtr conn, ...@@ -648,9 +647,8 @@ virStorageBackendRBDBuildVol(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
r = virStorageBackendRBDCreateImage(ptr.ioctx, vol->name, if ((r = virStorageBackendRBDCreateImage(ptr.ioctx, vol->name,
vol->target.capacity); vol->target.capacity)) < 0) {
if (r < 0) {
virReportSystemError(-r, _("failed to create volume '%s/%s'"), virReportSystemError(-r, _("failed to create volume '%s/%s'"),
pool->def->source.name, pool->def->source.name,
vol->name); vol->name);
...@@ -1003,9 +1001,10 @@ virStorageBackendRBDBuildVolFrom(virConnectPtr conn, ...@@ -1003,9 +1001,10 @@ virStorageBackendRBDBuildVolFrom(virConnectPtr conn,
return ret; return ret;
} }
static int virStorageBackendRBDRefreshVol(virConnectPtr conn, static int
virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageBackendRBDRefreshVol(virConnectPtr conn,
virStorageVolDefPtr vol) virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
virStorageVolDefPtr vol)
{ {
virStorageBackendRBDState ptr; virStorageBackendRBDState ptr;
ptr.cluster = NULL; ptr.cluster = NULL;
...@@ -1028,11 +1027,12 @@ static int virStorageBackendRBDRefreshVol(virConnectPtr conn, ...@@ -1028,11 +1027,12 @@ static int virStorageBackendRBDRefreshVol(virConnectPtr conn,
return ret; return ret;
} }
static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, static int
virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED,
virStorageVolDefPtr vol, virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
unsigned long long capacity, virStorageVolDefPtr vol,
unsigned int flags) unsigned long long capacity,
unsigned int flags)
{ {
virStorageBackendRBDState ptr; virStorageBackendRBDState ptr;
ptr.cluster = NULL; ptr.cluster = NULL;
...@@ -1049,15 +1049,13 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -1049,15 +1049,13 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED,
if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0)
goto cleanup; goto cleanup;
r = rbd_open(ptr.ioctx, vol->name, &image, NULL); if ((r = rbd_open(ptr.ioctx, vol->name, &image, NULL)) < 0) {
if (r < 0) {
virReportSystemError(-r, _("failed to open the RBD image '%s'"), virReportSystemError(-r, _("failed to open the RBD image '%s'"),
vol->name); vol->name);
goto cleanup; goto cleanup;
} }
r = rbd_resize(image, capacity); if ((r = rbd_resize(image, capacity)) < 0) {
if (r < 0) {
virReportSystemError(-r, _("failed to resize the RBD image '%s'"), virReportSystemError(-r, _("failed to resize the RBD image '%s'"),
vol->name); vol->name);
goto cleanup; goto cleanup;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或