40397910b3
Resolves: bz#1631372 bz#1636902 bz#1637084 Signed-off-by: Sunil Kumar Acharya <sheggodu@redhat.com>
54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
From 117b04bf6379a85d21f77a1d961241e95ad67a44 Mon Sep 17 00:00:00 2001
|
|
From: Mohit Agrawal <moagrawa@redhat.com>
|
|
Date: Tue, 16 Oct 2018 19:55:10 +0530
|
|
Subject: [PATCH 404/404] core: Resolve some warnings to release a build
|
|
|
|
Change-Id: I365073fbda9f19ef919f8d869f84a7018eb66d72
|
|
BUG: 1631372
|
|
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/152991
|
|
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
Reviewed-by: Amar Tumballi <amarts@redhat.com>
|
|
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
---
|
|
xlators/mgmt/glusterd/src/glusterd-quota.c | 2 +-
|
|
xlators/protocol/server/src/server.c | 2 --
|
|
2 files changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
|
|
index 6d3918b..55bbac7 100644
|
|
--- a/xlators/mgmt/glusterd/src/glusterd-quota.c
|
|
+++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
|
|
@@ -2101,7 +2101,7 @@ glusterd_op_stage_quota (dict_t *dict, char **op_errstr, dict_t *rsp_dict)
|
|
if (errno == ERANGE || hard_limit < 0)
|
|
gf_asprintf (op_errstr, "Hard-limit "
|
|
"value out of range (0 - %"PRId64
|
|
- "): %s", hard_limit_str);
|
|
+ "): %s", hard_limit, hard_limit_str);
|
|
else
|
|
gf_msg (this->name, GF_LOG_ERROR, errno,
|
|
GD_MSG_CONVERSION_FAILED,
|
|
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
|
|
index 3a429bc..65d712f 100644
|
|
--- a/xlators/protocol/server/src/server.c
|
|
+++ b/xlators/protocol/server/src/server.c
|
|
@@ -710,7 +710,6 @@ server_graph_janitor_threads(void *data)
|
|
{
|
|
xlator_t *victim = NULL;
|
|
xlator_t *this = NULL;
|
|
- server_conf_t *conf = NULL;
|
|
glusterfs_ctx_t *ctx = NULL;
|
|
char *victim_name = NULL;
|
|
server_cleanup_xprt_arg_t *arg = NULL;
|
|
@@ -724,7 +723,6 @@ server_graph_janitor_threads(void *data)
|
|
this = arg->this;
|
|
victim_name = arg->victim_name;
|
|
THIS = arg->this;
|
|
- conf = this->private;
|
|
|
|
ctx = THIS->ctx;
|
|
GF_VALIDATE_OR_GOTO(this->name, ctx, out);
|
|
--
|
|
1.8.3.1
|
|
|