diff options
author | Prasanna Kumar Kalever <prasanna.kalever@redhat.com> | 2017-02-19 14:40:12 +0530 |
---|---|---|
committer | Prasanna Kumar Kalever <prasanna.kalever@redhat.com> | 2017-02-19 14:40:51 +0530 |
commit | 245ee93f275301ad7f277b37614a30853d9def36 (patch) | |
tree | 2a47468e2a07368799a5a4473275eaab4c03913b /rpc/glfs-operations.c | |
parent | eb77f631c62e54644ca0515b619a06fd330a2d63 (diff) |
gluster-block: refactor return values
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
Diffstat (limited to 'rpc/glfs-operations.c')
-rw-r--r-- | rpc/glfs-operations.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/rpc/glfs-operations.c b/rpc/glfs-operations.c index 26d89e3..4b84528 100644 --- a/rpc/glfs-operations.c +++ b/rpc/glfs-operations.c @@ -87,18 +87,34 @@ glusterBlockCreateEntry(struct glfs *glfs, if (!tgfd) { LOG("gfapi", GB_LOG_ERROR, "glfs_creat(%s) on volume %s failed[%s]", gbid, blk->volume, strerror(errno)); + ret = -1; + goto out; } else { ret = glfs_ftruncate(tgfd, blk->size); if (ret) { LOG("gfapi", GB_LOG_ERROR, "glfs_ftruncate(%s): on volume %s " "of size %zu failed[%s]", gbid, blk->volume, blk->size, strerror(errno)); + + if (tgfd && glfs_close(tgfd) != 0) { + LOG("gfapi", GB_LOG_ERROR, "glfs_close(%s): on volume %s failed[%s]", + gbid, blk->volume, strerror(errno)); + } + + ret = glfs_unlink(glfs, gbid); + if (ret && errno != ENOENT) { + LOG("gfapi", GB_LOG_ERROR, "glfs_unlink(%s) on volume %s failed[%s]", + gbid, blk->volume, strerror(errno)); + } + + ret = -1; goto out; } if (tgfd && glfs_close(tgfd) != 0) { LOG("gfapi", GB_LOG_ERROR, "glfs_close(%s): on volume %s failed[%s]", gbid, blk->volume, strerror(errno)); + ret = -1; goto out; } } @@ -201,8 +217,9 @@ blockFreeMetaInfo(MetaInfo *info) if (!info) return; - for (i = 0; i < info->nhosts; i++) + for (i = 0; i < info->nhosts; i++) { GB_FREE(info->list[i]); + } GB_FREE(info->list); GB_FREE(info); @@ -282,7 +299,7 @@ blockGetMetaInfo(struct glfs* glfs, char* metafile, MetaInfo *info) struct glfs_fd *tgmfd = NULL; char line[1024]; char *tmp; - int ret = 0; + int ret; ret = glfs_chdir (glfs, GB_METADIR); |