diff options
| author |   David Teigland <teigland@redhat.com> | 2007-01-09 09:41:48 -0600 |
|---|---|---|
| committer |   Steven Whitehouse <swhiteho@redhat.com> | 2007-02-05 13:36:37 -0500 |
| commit | 68c817a1c4e21b893672ac73d8a498e6647453aa (patch) | |
| tree | 12c0fe9bd087ac1a0189048a7f4535993d6cb697 /fs/dlm/recover.c | |
| parent | [DLM] change some log_error to log_debug (diff) | |
| download | linux-dev-68c817a1c4e21b893672ac73d8a498e6647453aa.tar.xz linux-dev-68c817a1c4e21b893672ac73d8a498e6647453aa.zip | |
[DLM] rename dlm_config_info fields
Add a "ci_" prefix to the fields in the dlm_config_info struct so that we
can use macros to add configfs functions to access them (in a later
patch). No functional changes in this patch, just naming changes.
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/dlm/recover.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c index cf9f6831bab5..a7fa4cb6cd16 100644 --- a/fs/dlm/recover.c +++ b/fs/dlm/recover.c @@ -44,7 +44,7 @@ static void dlm_wait_timer_fn(unsigned long data) { struct dlm_ls *ls = (struct dlm_ls *) data; - mod_timer(&ls->ls_timer, jiffies + (dlm_config.recover_timer * HZ)); + mod_timer(&ls->ls_timer, jiffies + (dlm_config.ci_recover_timer * HZ)); wake_up(&ls->ls_wait_general); } @@ -55,7 +55,7 @@ int dlm_wait_function(struct dlm_ls *ls, int (*testfn) (struct dlm_ls *ls)) init_timer(&ls->ls_timer); ls->ls_timer.function = dlm_wait_timer_fn; ls->ls_timer.data = (long) ls; - ls->ls_timer.expires = jiffies + (dlm_config.recover_timer * HZ); + ls->ls_timer.expires = jiffies + (dlm_config.ci_recover_timer * HZ); add_timer(&ls->ls_timer); wait_event(ls->ls_wait_general, testfn(ls) || dlm_recovery_stopped(ls)); |