[Cluster-devel] cluster/rgmanager/src/daemons resrules.c
lhh at sourceware.org
lhh at sourceware.org
Fri Oct 20 20:59:49 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: lhh at sourceware.org 2006-10-20 20:59:49
Modified files:
rgmanager/src/daemons: resrules.c
Log message:
Roll back patch to resrules.c
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/resrules.c.diff?cvsroot=cluster&r1=1.15&r2=1.16
--- cluster/rgmanager/src/daemons/resrules.c 2006/10/20 20:29:16 1.15
+++ cluster/rgmanager/src/daemons/resrules.c 2006/10/20 20:59:49 1.16
@@ -394,48 +394,6 @@
/**
- Take the first unique + required attr and call it the 'primary' attr
- for rgmanager. If there's no primary, index 0 becomes the primary attr.
- */
-int
-choose_primary(resource_attr_t *attrs)
-{
- int x = 0, primary = 0;
- int flags;
- char *name, *val;
-
- if (!attrs)
- return 0;
-
- for (x = 0; attrs[x].ra_name; x++) {
-
- if ((attrs[x].ra_flags & (RA_UNIQUE | RA_REQUIRED)) ==
- (RA_UNIQUE | RA_REQUIRED)) {
- primary = x;
- break;
- }
- }
-
- if (primary != 0) {
- flags = attrs[primary].ra_flags | RA_PRIMARY;
- name = attrs[primary].ra_name;
- val = attrs[primary].ra_value;
-
- attrs[primary].ra_flags = attrs[0].ra_flags;
- attrs[primary].ra_name = attrs[0].ra_name;
- attrs[primary].ra_value = attrs[0].ra_value;
-
- attrs[0].ra_flags = flags;
- attrs[0].ra_name = name;
- attrs[0].ra_value = val;
- } else {
- attrs[0].ra_flags |= RA_PRIMARY;
- }
-
- return 0;
-}
-
-/**
Store a child type in the child array of a resource rule.
XXX Could be rewritten to use list macros.
@@ -704,9 +662,6 @@
store_attribute(&rr->rr_attrs, attrname, ret, flags);
}
- if (!primary_found)
- choose_primary(rr->rr_attrs);
-
return 0;
}
More information about the Cluster-devel
mailing list