Skip to content

Commit

Permalink
[DLM] fix compile breakage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Teigland authored and Steven Whitehouse committed Jul 9, 2007
1 parent 8b0e7b2 commit 639aca4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/dlm/lock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1098,8 +1098,8 @@ void dlm_scan_timeout(struct dlm_ls *ls)
}

if (do_cancel) {
log_debug("timeout cancel %x node %d %s", lkb->lkb_id,
lkb->lkb_nodeid, r->res_name);
log_debug(r->res_ls, "timeout cancel %x node %d %s",
lkb->lkb_id, lkb->lkb_nodeid, r->res_name);
lkb->lkb_flags &= ~DLM_IFL_WATCH_TIMEWARN;
lkb->lkb_flags |= DLM_IFL_TIMEOUT_CANCEL;
del_timeout(lkb);
Expand Down

0 comments on commit 639aca4

Please sign in to comment.