cluster: STABLE31 - dlm_controld: fix build with old (< 3.0) kernel headers (take 2)
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: cddeef5a35a6c4be8ab351079d77b953d3b6db83
Parent: 98040b3146d843402026e3918e6ac563c4687919
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Aug 24 08:35:33 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Aug 24 08:35:33 2011 +0200
dlm_controld: fix build with old (< 3.0) kernel headers (take 2)
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
group/dlm_controld/plock.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c
index a22a21a..fbfe1b0 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -3,6 +3,15 @@
#include <linux/dlm_plock.h>
+/* FIXME: remove this once everyone is using the version of
+ * dlm_plock.h which defines it */
+
+#ifndef DLM_PLOCK_FL_CLOSE
+#warning DLM_PLOCK_FL_CLOSE undefined. Enabling build workaround.
+#define DLM_PLOCK_FL_CLOSE 1
+#define DLM_PLOCK_BUILD_WORKAROUND 1
+#endif
+
static uint32_t plock_read_count;
static uint32_t plock_recv_count;
static uint32_t plock_rate_delays;
@@ -737,12 +746,7 @@ static void do_unlock(struct lockspace *ls, struct dlm_plock_info *in,
rv = unlock_internal(ls, r, in);
-/* FIXME: remove this once everyone is using the version of
- * dlm_plock.h which defines it */
-
-#ifndef DLM_PLOCK_FL_CLOSE
-#warning DLM_PLOCK_FL_CLOSE undefined. Enabling build workaround.
-#define DLM_PLOCK_FL_CLOSE 1
+#ifdef DLM_PLOCK_BUILD_WORKAROUND
if (in->pad & DLM_PLOCK_FL_CLOSE) {
#else
if (in->flags & DLM_PLOCK_FL_CLOSE) {
@@ -1592,7 +1596,11 @@ void process_plocks(int ci)
return;
fail:
+#ifdef DLM_PLOCK_BUILD_WORKAROUND
+ if (!(info.pad & DLM_PLOCK_FL_CLOSE)) {
+#else
if (!(info.flags & DLM_PLOCK_FL_CLOSE)) {
+#endif
info.rv = rv;
rv = write(plock_device_fd, &info, sizeof(info));
}
12 years, 10 months
cluster: RHEL6 - cman: make RRP mode passive the default
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 9be180ab1ac0f7e84818ae17c7fddd1f168d22da
Parent: 95d90a01d89a610074a4817f1f2cbe67419a7654
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Aug 23 09:25:52 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue Aug 23 09:36:18 2011 +0200
cman: make RRP mode passive the default
RRP in active mode is still too fresh and needs some more work in corosync.
Put rrp_mode=passive as default and still allow users to tune it if they feel brave
enough.
Resolves: rhbz#732635
Reviewed-by: Jan Friesse <jfriesse(a)redhat.com>
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/daemon/cman-preconfig.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index 7374fa4..6d52be1 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -999,7 +999,7 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
if (objdb_get_string(objdb, object_handle, "rrp_mode", &value)) {
if (num_interfaces > 1) {
objdb->object_key_create_typed(object_handle, "rrp_mode",
- "active", strlen("active")+1, OBJDB_VALUETYPE_STRING);
+ "passive", strlen("passive")+1, OBJDB_VALUETYPE_STRING);
}
else {
objdb->object_key_create_typed(object_handle, "rrp_mode",
12 years, 10 months
cluster: STABLE31 - cman: make RRP mode passive the default
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 98040b3146d843402026e3918e6ac563c4687919
Parent: 68d8ae050e6d485a8013dc5b609f59b86ab65c81
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Aug 23 09:25:52 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue Aug 23 09:25:52 2011 +0200
cman: make RRP mode passive the default
RRP in active mode is still too fresh and needs some more work in corosync.
Put rrp_mode=passive as default and still allow users to tune it if they feel brave
enough.
Resolves: rhbz#732635
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/daemon/cman-preconfig.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index 99aa532..4b8419e 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -984,7 +984,7 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
if (objdb_get_string(objdb, object_handle, "rrp_mode", &value)) {
if (num_interfaces > 1) {
objdb->object_key_create_typed(object_handle, "rrp_mode",
- "active", strlen("active")+1, OBJDB_VALUETYPE_STRING);
+ "passive", strlen("passive")+1, OBJDB_VALUETYPE_STRING);
}
else {
objdb->object_key_create_typed(object_handle, "rrp_mode",
12 years, 10 months
fence-agents: RHEL6 - fence_rhevm: change "UP" status to "up" state as the REST-API has changed
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 4407a92ac0ba01432167e60ff0d6cc3831749b40
Parent: 68001a547dca906c708917e1caf15e53a63547df
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Aug 22 10:02:25 2011 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Aug 22 10:04:22 2011 +0200
fence_rhevm: change "UP" status to "up" state as the REST-API has changed
Resolves: rhbz#731166
---
fence/agents/rhevm/fence_rhevm.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py
index c3ef29a..e233968 100644
--- a/fence/agents/rhevm/fence_rhevm.py
+++ b/fence/agents/rhevm/fence_rhevm.py
@@ -13,7 +13,7 @@ BUILD_DATE="March, 2008"
re_get_id = re.compile("<vm id=\"(.*?)\"", re.IGNORECASE);
-re_status = re.compile("<status>(.*?)</status>", re.IGNORECASE);
+re_status = re.compile("<state>(.*?)</state>", re.IGNORECASE);
re_get_name = re.compile("<name>(.*?)</name>", re.IGNORECASE);
def get_power_status(conn, options):
@@ -41,7 +41,7 @@ def get_power_status(conn, options):
else:
status = result.group(1)
- if (status == "UP"):
+ if (status == "up"):
return "on"
else:
return "off"
12 years, 10 months
fence-agents: master - fence_rhevm: change "UP" status to "up" state as the REST-API has changed
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 22ba49657526c0aacaadb5fdb6a53a8b88130531
Parent: 1a961801928dd0f79991e5bf0e81483aeaf7351a
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Aug 22 10:02:25 2011 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Aug 22 10:02:25 2011 +0200
fence_rhevm: change "UP" status to "up" state as the REST-API has changed
Resolves: rhbz#731166
---
fence/agents/rhevm/fence_rhevm.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py
index c3ef29a..e233968 100644
--- a/fence/agents/rhevm/fence_rhevm.py
+++ b/fence/agents/rhevm/fence_rhevm.py
@@ -13,7 +13,7 @@ BUILD_DATE="March, 2008"
re_get_id = re.compile("<vm id=\"(.*?)\"", re.IGNORECASE);
-re_status = re.compile("<status>(.*?)</status>", re.IGNORECASE);
+re_status = re.compile("<state>(.*?)</state>", re.IGNORECASE);
re_get_name = re.compile("<name>(.*?)</name>", re.IGNORECASE);
def get_power_status(conn, options):
@@ -41,7 +41,7 @@ def get_power_status(conn, options):
else:
status = result.group(1)
- if (status == "UP"):
+ if (status == "up"):
return "on"
else:
return "off"
12 years, 10 months
dlm: master - dlm_controld: fix plock dev_write no op
by David Teigland
Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=297eb380...
Commit: 297eb3800e2b24b764d2bc8483d2ef72b40a0779
Parent: 13a814433588ba0a9d8228dcb2e6c6dba6f3c861
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Aug 19 10:48:13 2011 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Aug 19 10:48:13 2011 -0500
dlm_controld: fix plock dev_write no op
When a plock unlock is received due to the file
being closed (the CLOSE flag is set), we should
not write an unlock result back to the kernel.
If we do, the kernel, which does not expect a
reply, will report the error "dev_write no op".
In cases where dlm_controld encounters and error
handling the unlock operation, it was writing
the error result back to the kernel, even though
the unlock was flagged with CLOSE. The fix is
to check for the CLOSE flag and skip writing
the error result, as we do with normal results.
This problem is especially visible when using
flocks (not plocks). This is because the kernel
generates extraneous plock unlock requests
when files are closed with flocks. Because
dlm_controld finds no plocks on the files,
it replies to the kernel with an error, rather
than skipping the reply to do CLOSE.
bz 731775
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
group/dlm_controld/plock.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c
index 3848308..12f35de 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -1641,8 +1641,10 @@ void process_plocks(int ci)
return;
fail:
- info.rv = rv;
- rv = write(plock_device_fd, &info, sizeof(info));
+ if (!(info.flags & DLM_PLOCK_FL_CLOSE)) {
+ info.rv = rv;
+ rv = write(plock_device_fd, &info, sizeof(info));
+ }
}
void process_saved_plocks(struct lockspace *ls)
12 years, 10 months
cluster: STABLE31 - dlm_controld: fix plock dev_write no op
by David Teigland
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 68d8ae050e6d485a8013dc5b609f59b86ab65c81
Parent: 90182b28490ec8383e2d45dbab8c23a1d1420bdc
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Aug 18 14:18:04 2011 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Aug 19 10:44:37 2011 -0500
dlm_controld: fix plock dev_write no op
When a plock unlock is received due to the file
being closed (the CLOSE flag is set), we should
not write an unlock result back to the kernel.
If we do, the kernel, which does not expect a
reply, will report the error "dev_write no op".
In cases where dlm_controld encounters and error
handling the unlock operation, it was writing
the error result back to the kernel, even though
the unlock was flagged with CLOSE. The fix is
to check for the CLOSE flag and skip writing
the error result, as we do with normal results.
This problem is especially visible when using
flocks (not plocks). This is because the kernel
generates extraneous plock unlock requests
when files are closed with flocks. Because
dlm_controld finds no plocks on the files,
it replies to the kernel with an error, rather
than skipping the reply to do CLOSE.
bz 731775
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
group/dlm_controld/plock.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c
index 166f6c9..a22a21a 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -1592,8 +1592,10 @@ void process_plocks(int ci)
return;
fail:
- info.rv = rv;
- rv = write(plock_device_fd, &info, sizeof(info));
+ if (!(info.flags & DLM_PLOCK_FL_CLOSE)) {
+ info.rv = rv;
+ rv = write(plock_device_fd, &info, sizeof(info));
+ }
}
void process_saved_plocks(struct lockspace *ls)
12 years, 10 months
cluster: RHEL6 - dlm_controld: fix plock dev_write no op
by David Teigland
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 95d90a01d89a610074a4817f1f2cbe67419a7654
Parent: db4e72fc23571c63de3e2475d6380990525fcce9
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Aug 18 14:18:04 2011 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Aug 18 14:18:04 2011 -0500
dlm_controld: fix plock dev_write no op
When a plock unlock is received due to the file
being closed (the CLOSE flag is set), we should
not write an unlock result back to the kernel.
If we do, the kernel, which does not expect a
reply, will report the error "dev_write no op".
In cases where dlm_controld encounters and error
handling the unlock operation, it was writing
the error result back to the kernel, even though
the unlock was flagged with CLOSE. The fix is
to check for the CLOSE flag and skip writing
the error result, as we do with normal results.
This problem is especially visible when using
flocks (not plocks). This is because the kernel
generates extraneous plock unlock requests
when files are closed with flocks. Because
dlm_controld finds no plocks on the files,
it replies to the kernel with an error, rather
than skipping the reply to do CLOSE.
bz 731775
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
group/dlm_controld/plock.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c
index 6d5dea8..556993b 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -1583,8 +1583,10 @@ void process_plocks(int ci)
return;
fail:
- info.rv = rv;
- rv = write(plock_device_fd, &info, sizeof(info));
+ if (!(info.flags & DLM_PLOCK_FL_CLOSE)) {
+ info.rv = rv;
+ rv = write(plock_device_fd, &info, sizeof(info));
+ }
}
void process_saved_plocks(struct lockspace *ls)
12 years, 10 months
cluster: RHEL6 - mount.gfs2: Fix mounting of regular files with -o loop
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: db4e72fc23571c63de3e2475d6380990525fcce9
Parent: f21ea8f1c1eba7a641dc3edfbfc14015282f92af
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Wed Aug 17 16:38:18 2011 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Thu Aug 18 12:48:49 2011 +0100
mount.gfs2: Fix mounting of regular files with -o loop
When we use -o loop, mount(8) sets up the loop device and passes
loop=/dev/loopN to mount.gfs2, which currently naively passes this option to
mount(2). As gfs2 doesn't recognise the loop option, mounting fails with
EINVAL.
This patch stops mount.gfs2 from passing loop=/dev/loopN to mount(2) to fix
this problem and also makes sure this option appears in /etc/mtab so that
umount(8) can automatically free up the loop device on unmount.
rhbz#729071
Signed-off-by: Andrew Price <anprice(a)redhat.com>
Reviewed-by: Steven Whitehouse <swhiteho(a)redhat.com>
---
gfs2/mount/util.c | 29 ++++++++++++++++++++++++++---
gfs2/mount/util.h | 1 +
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/gfs2/mount/util.c b/gfs2/mount/util.c
index 5a1f999..3884389 100644
--- a/gfs2/mount/util.c
+++ b/gfs2/mount/util.c
@@ -150,6 +150,16 @@ void parse_opts(struct mount_options *mo)
continue;
}
+ /* mount(8) will have already set up the loop device for us so
+ we can safely ignore the loop= option it provides and avoid
+ getting an EINVAL from gfs2. However, we still need to make
+ sure the option appears in mtab so that umount(8) can
+ automatically free up the loop device. */
+ if (!strncmp("loop", o, 4)) {
+ strncpy(mo->loopopt, o, PATH_MAX);
+ continue;
+ }
+
if (extra_len + 1 + strlen(o) > PATH_MAX)
die("extra options string is too long\n");
@@ -261,6 +271,8 @@ void read_proc_mounts(struct mount_options *mo)
char save_opts[PATH_MAX];
char save_device[PATH_MAX];
int found = 0;
+ int freq = 0;
+ int passno = 0;
struct stat st_mo_dev, st_mounts_dev;
file = fopen("/proc/mounts", "r");
@@ -274,8 +286,14 @@ void read_proc_mounts(struct mount_options *mo)
}
while (fgets(line, PATH_MAX, file)) {
- if (sscanf(line, "%s %s %s %s", device, path, type, opts) != 4)
- continue;
+ if (mo->loopopt[0] == '\0') {
+ if (sscanf(line, "%s %s %s %s", device, path, type, opts) != 4)
+ continue;
+ } else {
+ if (sscanf(line, "%s %s %s %s %d %d",
+ device, path, type, opts, &freq, &passno) != 6)
+ continue;
+ }
if (strcmp(path, mo->dir)) {
if (!strchr(path, '\\'))
continue;
@@ -301,7 +319,11 @@ void read_proc_mounts(struct mount_options *mo)
strncpy(save_device, device, PATH_MAX);
strncpy(save_opts, opts, PATH_MAX);
- strncpy(save_line, line, PATH_MAX);
+ if (mo->loopopt[0] != '\0')
+ snprintf(save_line, PATH_MAX, "%s %s %s %s,%s %d %d\n",
+ device, path, type, opts, mo->loopopt, freq, passno);
+ else
+ strncpy(save_line, line, PATH_MAX);
found = 1;
}
@@ -318,6 +340,7 @@ void read_proc_mounts(struct mount_options *mo)
log_debug("read_proc_mounts: device = \"%s\"", mo->specified_dev);
log_debug("read_proc_mounts: dm device = \"%s\"", mo->dev);
log_debug("read_proc_mounts: opts = \"%s\"", mo->opts);
+ log_debug("read_proc_mounts: proc_entry = \"%s\"", mo->proc_entry);
}
static void gfs2_inum_in(struct gfs2_inum *no, char *buf)
diff --git a/gfs2/mount/util.h b/gfs2/mount/util.h
index e866cd4..8b05aa5 100644
--- a/gfs2/mount/util.h
+++ b/gfs2/mount/util.h
@@ -50,6 +50,7 @@ struct mount_options {
char dev[PATH_MAX+1];
char dir[PATH_MAX+1];
char opts[PATH_MAX+1];
+ char loopopt[PATH_MAX+1];
char hostdata[PATH_MAX+1];
char extra[PATH_MAX+1];
char extra_plus[PATH_MAX+1];
12 years, 10 months
cluster: RHEL6 - cman: check and set transport only when parsing primary interface
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: f21ea8f1c1eba7a641dc3edfbfc14015282f92af
Parent: 234c0749b15ca95277e6ac4ebf9e68234e9b161f
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Thu Aug 18 09:31:36 2011 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Thu Aug 18 10:22:15 2011 +0200
cman: check and set transport only when parsing primary interface
Fix regression introduced in da36fb6bc9e in combination with altname/RRP support
Resolves: rhbz#695795
Reviewed-by: Christine Caulfield <ccaulfie(a)redhat.com>
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/daemon/cman-preconfig.c | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index c85331b..7374fa4 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -289,7 +289,10 @@ static int add_udpu_members(struct objdb_iface_ver0 *objdb, hdb_handle_t interfa
return 0;
}
-static int add_ifaddr(struct objdb_iface_ver0 *objdb, char *mcast, char *ifaddr, int port, int ttl, enum tx_mech transport)
+#define PRIMARY_IFACE 0
+#define ALT_IFACE 1
+
+static int add_ifaddr(struct objdb_iface_ver0 *objdb, char *mcast, char *ifaddr, int port, int ttl, int altiface, enum tx_mech transport)
{
hdb_handle_t totem_object_handle;
hdb_handle_t find_handle;
@@ -323,15 +326,17 @@ static int add_ifaddr(struct objdb_iface_ver0 *objdb, char *mcast, char *ifaddr,
if (objdb->object_find_next(find_handle, &totem_object_handle)) {
objdb->object_create(OBJECT_PARENT_HANDLE, &totem_object_handle,
"totem", strlen("totem"));
- }
+ }
objdb->object_find_destroy(find_handle);
- if (objdb_get_string(objdb, totem_object_handle, "transport", &transportstr)) {
- objdb->object_key_create_typed(totem_object_handle, "transport",
- tx_mech_to_str[transport], strlen(tx_mech_to_str[transport]) + 1, OBJDB_VALUETYPE_STRING);
- } else {
- sprintf(error_reason, "Transport should not be specified within <totem .../>, use <cman transport=\"...\" /> instead");
- return -1;
+ if (!altiface) {
+ if (objdb_get_string(objdb, totem_object_handle, "transport", &transportstr)) {
+ objdb->object_key_create_typed(totem_object_handle, "transport",
+ tx_mech_to_str[transport], strlen(tx_mech_to_str[transport]) + 1, OBJDB_VALUETYPE_STRING);
+ } else {
+ sprintf(error_reason, "Transport should not be specified within <totem .../>, use <cman transport=\"...\" /> instead");
+ return -1;
+ }
}
if (objdb->object_create(totem_object_handle, &interface_object_handle,
@@ -764,7 +769,8 @@ static int get_nodename(struct objdb_iface_ver0 *objdb)
}
}
- if (add_ifaddr(objdb, mcast_name, nodename, portnum, ttl, transport)) {
+ if (add_ifaddr(objdb, mcast_name, nodename, portnum, ttl,
+ PRIMARY_IFACE, transport)) {
write_cman_pipe(error_reason);
return -1;
}
@@ -790,7 +796,8 @@ static int get_nodename(struct objdb_iface_ver0 *objdb)
mcast = mcast_name;
}
- if (add_ifaddr(objdb, mcast, node, portnum, altttl, transport)) {
+ if (add_ifaddr(objdb, mcast, node, portnum, altttl,
+ ALT_IFACE, transport)) {
write_cman_pipe(error_reason);
return -1;
}
12 years, 10 months