|
 |
12a457 |
From afc282fde961ec2b7d77b18dc44dbfa72288fd56 Mon Sep 17 00:00:00 2001
|
|
|
12a457 |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
12a457 |
Date: Tue, 24 May 2016 12:35:02 +0530
|
|
|
12a457 |
Subject: [PATCH 172/178] glusterd: Fix signature of glusterd_volinfo_copy_brick_portinfo
|
|
|
12a457 |
|
|
|
12a457 |
Commit ca2e9d2 in downstream introduced an accidental change in the signature of
|
|
|
12a457 |
glusterd_volinfo_copy_brick_portinfo () which caused new volume's
|
|
|
12a457 |
brickinfo->port to zeroed out.
|
|
|
12a457 |
|
|
|
12a457 |
Label : DOWNSTREAM ONLY
|
|
|
12a457 |
|
|
|
12a457 |
Change-Id: I31a45a824f7165ea3a86bb4ba4eca15f2e47e8f8
|
|
|
12a457 |
BUG: 1337384
|
|
|
12a457 |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
12a457 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/74996
|
|
|
12a457 |
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
|
|
|
12a457 |
---
|
|
|
12a457 |
xlators/mgmt/glusterd/src/glusterd-utils.c | 5 ++---
|
|
|
12a457 |
1 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
12a457 |
|
|
|
12a457 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
12a457 |
index 0573808..01fd446 100644
|
|
|
12a457 |
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
12a457 |
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
12a457 |
@@ -3842,8 +3842,8 @@ out:
|
|
|
12a457 |
}
|
|
|
12a457 |
|
|
|
12a457 |
int32_t
|
|
|
12a457 |
-glusterd_volinfo_copy_brick_portinfo (glusterd_volinfo_t *old_volinfo,
|
|
|
12a457 |
- glusterd_volinfo_t *new_volinfo)
|
|
|
12a457 |
+glusterd_volinfo_copy_brick_portinfo (glusterd_volinfo_t *new_volinfo,
|
|
|
12a457 |
+ glusterd_volinfo_t *old_volinfo)
|
|
|
12a457 |
{
|
|
|
12a457 |
char pidfile[PATH_MAX+1] = {0,};
|
|
|
12a457 |
glusterd_brickinfo_t *new_brickinfo = NULL;
|
|
|
12a457 |
@@ -3851,7 +3851,6 @@ glusterd_volinfo_copy_brick_portinfo (glusterd_volinfo_t *old_volinfo,
|
|
|
12a457 |
glusterd_conf_t *priv = NULL;
|
|
|
12a457 |
int ret = 0;
|
|
|
12a457 |
xlator_t *this = NULL;
|
|
|
12a457 |
- char abspath[PATH_MAX] = {0};
|
|
|
12a457 |
|
|
|
12a457 |
GF_ASSERT (new_volinfo);
|
|
|
12a457 |
GF_ASSERT (old_volinfo);
|
|
|
12a457 |
--
|
|
|
12a457 |
1.7.1
|
|
|
12a457 |
|