diff options
author | David Teigland <teigland@redhat.com> | 2007-05-18 17:02:57 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-07-09 03:22:45 -0400 |
commit | 639aca417d91ebba1077a6084e4423af1c1dd811 (patch) | |
tree | b542aa0720998f1f64fe629bdc950668f33efdf4 /fs | |
parent | 8b0e7b2cf35aa827ed5efb508c1879481b970496 (diff) |
[DLM] fix compile breakage
In the rush to get the previous patch set sent, a compilation bug I fixed
shortly before sending somehow got clobbered, probably by a missed quilt
refresh or something.
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/dlm/lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 3c4d570477b4..b47e6fd0172c 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c | |||
@@ -1098,8 +1098,8 @@ void dlm_scan_timeout(struct dlm_ls *ls) | |||
1098 | } | 1098 | } |
1099 | 1099 | ||
1100 | if (do_cancel) { | 1100 | if (do_cancel) { |
1101 | log_debug("timeout cancel %x node %d %s", lkb->lkb_id, | 1101 | log_debug(r->res_ls, "timeout cancel %x node %d %s", |
1102 | lkb->lkb_nodeid, r->res_name); | 1102 | lkb->lkb_id, lkb->lkb_nodeid, r->res_name); |
1103 | lkb->lkb_flags &= ~DLM_IFL_WATCH_TIMEWARN; | 1103 | lkb->lkb_flags &= ~DLM_IFL_WATCH_TIMEWARN; |
1104 | lkb->lkb_flags |= DLM_IFL_TIMEOUT_CANCEL; | 1104 | lkb->lkb_flags |= DLM_IFL_TIMEOUT_CANCEL; |
1105 | del_timeout(lkb); | 1105 | del_timeout(lkb); |