← Back to branch summary

~ubuntu-branches/ubuntu/natty/redhat-cluster/natty

« back to all changes in this revision

Viewing changes to group/gfs_controld/config.c

  • Committer: Bazaar Package Importer
  • Author(s): Ante Karamatic
  • Date: 2009-09-15 07:15:43 UTC
  • mfrom: (1.1.16 upstream) (10.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090915071543-vr089k11l3kl9llu
Tags: 3.0.2-2ubuntu1
Remove unnecessary build dep on libvolume-id-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
group/gfs_controld/config.c
53
53
int cfgd_drop_resources_count   = DEFAULT_DROP_RESOURCES_COUNT;
54
54
int cfgd_drop_resources_age     = DEFAULT_DROP_RESOURCES_AGE;
55
55
 
56
 
void read_ccs_name(char *path, char *name)
 
56
void read_ccs_name(const char *path, char *name)
57
57
{
58
58
        char *str;
59
59
        int error;
67
67
        free(str);
68
68
}
69
69
 
70
 
void read_ccs_yesno(char *path, int *yes, int *no)
 
70
void read_ccs_yesno(const char *path, int *yes, int *no)
71
71
{
72
72
        char *str;
73
73
        int error;
88
88
        free(str);
89
89
}
90
90
 
91
 
int read_ccs_int(char *path, int *config_val)
 
91
int read_ccs_int(const char *path, int *config_val)
92
92
{
93
93
        char *str;
94
94
        int val;
170
170
        }
171
171
        ccs_handle = cd;
172
172
 
 
173
        /* plock_ownership is a special case */
 
174
        if (optd_plock_ownership)
 
175
                using_default_plock_ownership = 0;
 
176
        else
 
177
                using_default_plock_ownership = 1;
 
178
 
173
179
        /* These config values are set from cluster.conf only if they haven't
174
180
           already been set on the command line. */
175
181
 
182
188
        if (!optd_plock_ownership) {
183
189
                rv = read_ccs_int(PLOCK_OWNERSHIP_PATH, &cfgd_plock_ownership);
184
190
                if (rv < 0)
185
 
                        read_ccs_int(DLM_PLOCK_OWNERSHIP_PATH, &cfgd_plock_ownership);
 
191
                        rv = read_ccs_int(DLM_PLOCK_OWNERSHIP_PATH, &cfgd_plock_ownership);
 
192
                if (!rv)
 
193
                        using_default_plock_ownership = 0;
186
194
        }
187
195
 
188
196
        /* The following can be changed while running */