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