diff options
| author | Prasanna Kumar Kalever <prasanna.kalever@redhat.com> | 2018-03-06 15:25:07 +0530 |
|---|---|---|
| committer | Prasanna Kumar Kalever <prasanna.kalever@redhat.com> | 2018-03-06 15:42:26 +0530 |
| commit | 8b106204f52b283cdbe7a128c14f851dd54a150c (patch) | |
| tree | cb9ef79fe988409482e55d139fb60ad0c4c50bbe | |
| parent | 305e1c5ffead749fd6ea555b52e46d9e64c9bd55 (diff) | |
also other minor compiler errors
Change-Id: I17625008d91740f3ba9efc6e574ec3dcd0b6c85f
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
| -rw-r--r-- | cli/gluster-block.c | 2 | ||||
| -rw-r--r-- | gluster-block.spec.in | 4 | ||||
| -rw-r--r-- | rpc/block_svc_routines.c | 17 | ||||
| -rw-r--r-- | rpc/glfs-operations.c | 2 |
4 files changed, 19 insertions, 6 deletions
diff --git a/cli/gluster-block.c b/cli/gluster-block.c index bfdaa18..425de0f 100644 --- a/cli/gluster-block.c +++ b/cli/gluster-block.c @@ -264,7 +264,6 @@ glusterBlockParseVolumeBlock(char *volumeblock, char *volume, char *block, char *helpstr, char *op) { int ret = -1; - size_t len = 0; char *sep = NULL; char *tmp = NULL; @@ -600,7 +599,6 @@ glusterBlockReplace(int argcount, char **options, int json) { blockReplaceCli robj = {0}; int ret = -1; - bool singleBlock = false; char helpMsg[256] = {0, }; diff --git a/gluster-block.spec.in b/gluster-block.spec.in index e81a67f..29197c2 100644 --- a/gluster-block.spec.in +++ b/gluster-block.spec.in @@ -80,8 +80,12 @@ rm -rf ${RPM_BUILD_ROOT} %attr(755, root, root) %{_initddir}/gluster-blockd %endif %config(noreplace) %{_sysconfdir}/sysconfig/gluster-blockd +%{_sysconfdir}/sysconfig/gluster-block-caps.info %changelog +* Tue Mar 06 2018 Prasanna Kumar Kalever <prasanna.kalever@redhat.com> +- update about gluster-block-caps.info + * Mon Sep 25 2017 Prasanna Kumar Kalever <prasanna.kalever@redhat.com> - Fix Unclosed %if block in the spec file diff --git a/rpc/block_svc_routines.c b/rpc/block_svc_routines.c index 149c7f6..78178d3 100644 --- a/rpc/block_svc_routines.c +++ b/rpc/block_svc_routines.c @@ -517,6 +517,7 @@ glusterBlockCallRPC_1(char *host, void *cobj, case MODIFY_TPGC_SRV: case LIST_SRV: case INFO_SRV: + case REPLACE_GET_PORTAL_TPG_SRV: goto out; case REPLACE_SRV: *rpc_sent = TRUE; @@ -1457,6 +1458,12 @@ glusterBlockBuildMinCaps(void *data, operations opt) minCaps[GB_JSON_CAP] = true; } break; + case MODIFY_TPGC_SRV: + case REPLACE_GET_PORTAL_TPG_SRV: + case LIST_SRV: + case INFO_SRV: + case VERSION_SRV: + break; } return minCaps; @@ -2603,7 +2610,6 @@ block_modify_cli_1_svc_st(blockModifyCli *blk, struct svc_req *rqstp) int errCode = 0; char *errMsg = NULL; blockServerDefPtr list = NULL; - size_t i; LOG("mgmt", GB_LOG_DEBUG, @@ -2730,10 +2736,16 @@ block_modify_cli_1_svc_st(blockModifyCli *blk, struct svc_req *rqstp) "for block %s on volume %s", blk->auth_mode, ret, FAILED_REMOTE_AYNC_MODIFY, blk->block_name, info->volume); /* do nothing ? */ + errCode = ret; + goto out; } } - ret = 0; + errCode = 0; + + LOG("mgmt", GB_LOG_DEBUG, + "modify auth cli success, volume=%s blockname=%s auth=%d", + blk->volume, blk->block_name, blk->auth_mode); out: GB_METAUNLOCK(lkfd, blk->volume, ret, errMsg); @@ -3717,7 +3729,6 @@ block_delete_1_svc_st(blockDelete *blk, struct svc_req *rqstp) blockResponse * block_version_1_svc_st(void *data, struct svc_req *rqstp) { - int ret = -1; blockResponse *reply = NULL; if (GB_ALLOC(reply) < 0) { diff --git a/rpc/glfs-operations.c b/rpc/glfs-operations.c index 341a6e2..600174a 100644 --- a/rpc/glfs-operations.c +++ b/rpc/glfs-operations.c @@ -145,7 +145,7 @@ glusterBlockCreateEntry(struct glfs *glfs, blockCreateCli *blk, char *gbid, blk->storage, gbid, blk->volume, blk->block_name, strerror(errno)); GB_ASPRINTF(errMsg, "glfs_link(%s, %s) on volume %s for block %s failed [%s]", - blk->storage, gbid, strerror(errno)); + blk->storage, gbid, blk->volume, blk->block_name, strerror(errno)); goto out; } } else { |