diff options
Diffstat (limited to 'fs/ocfs2/dlm/dlmrecovery.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmrecovery.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index a2c33160bfd6..2fde7bf91434 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c | |||
@@ -259,7 +259,7 @@ static void dlm_print_reco_node_status(struct dlm_ctxt *dlm) | |||
259 | struct dlm_lock_resource *res; | 259 | struct dlm_lock_resource *res; |
260 | 260 | ||
261 | mlog(ML_NOTICE, "%s(%d): recovery info, state=%s, dead=%u, master=%u\n", | 261 | mlog(ML_NOTICE, "%s(%d): recovery info, state=%s, dead=%u, master=%u\n", |
262 | dlm->name, dlm->dlm_reco_thread_task->pid, | 262 | dlm->name, task_pid_nr(dlm->dlm_reco_thread_task), |
263 | dlm->reco.state & DLM_RECO_STATE_ACTIVE ? "ACTIVE" : "inactive", | 263 | dlm->reco.state & DLM_RECO_STATE_ACTIVE ? "ACTIVE" : "inactive", |
264 | dlm->reco.dead_node, dlm->reco.new_master); | 264 | dlm->reco.dead_node, dlm->reco.new_master); |
265 | 265 | ||
@@ -420,7 +420,7 @@ void dlm_wait_for_recovery(struct dlm_ctxt *dlm) | |||
420 | if (dlm_in_recovery(dlm)) { | 420 | if (dlm_in_recovery(dlm)) { |
421 | mlog(0, "%s: reco thread %d in recovery: " | 421 | mlog(0, "%s: reco thread %d in recovery: " |
422 | "state=%d, master=%u, dead=%u\n", | 422 | "state=%d, master=%u, dead=%u\n", |
423 | dlm->name, dlm->dlm_reco_thread_task->pid, | 423 | dlm->name, task_pid_nr(dlm->dlm_reco_thread_task), |
424 | dlm->reco.state, dlm->reco.new_master, | 424 | dlm->reco.state, dlm->reco.new_master, |
425 | dlm->reco.dead_node); | 425 | dlm->reco.dead_node); |
426 | } | 426 | } |
@@ -483,7 +483,7 @@ static int dlm_do_recovery(struct dlm_ctxt *dlm) | |||
483 | return 0; | 483 | return 0; |
484 | } | 484 | } |
485 | mlog(0, "%s(%d):recovery thread found node %u in the recovery map!\n", | 485 | mlog(0, "%s(%d):recovery thread found node %u in the recovery map!\n", |
486 | dlm->name, dlm->dlm_reco_thread_task->pid, | 486 | dlm->name, task_pid_nr(dlm->dlm_reco_thread_task), |
487 | dlm->reco.dead_node); | 487 | dlm->reco.dead_node); |
488 | spin_unlock(&dlm->spinlock); | 488 | spin_unlock(&dlm->spinlock); |
489 | 489 | ||
@@ -507,7 +507,7 @@ static int dlm_do_recovery(struct dlm_ctxt *dlm) | |||
507 | mlog(0, "another node will master this recovery session.\n"); | 507 | mlog(0, "another node will master this recovery session.\n"); |
508 | } | 508 | } |
509 | mlog(0, "dlm=%s (%d), new_master=%u, this node=%u, dead_node=%u\n", | 509 | mlog(0, "dlm=%s (%d), new_master=%u, this node=%u, dead_node=%u\n", |
510 | dlm->name, dlm->dlm_reco_thread_task->pid, dlm->reco.new_master, | 510 | dlm->name, task_pid_nr(dlm->dlm_reco_thread_task), dlm->reco.new_master, |
511 | dlm->node_num, dlm->reco.dead_node); | 511 | dlm->node_num, dlm->reco.dead_node); |
512 | 512 | ||
513 | /* it is safe to start everything back up here | 513 | /* it is safe to start everything back up here |
@@ -520,7 +520,7 @@ static int dlm_do_recovery(struct dlm_ctxt *dlm) | |||
520 | 520 | ||
521 | master_here: | 521 | master_here: |
522 | mlog(0, "(%d) mastering recovery of %s:%u here(this=%u)!\n", | 522 | mlog(0, "(%d) mastering recovery of %s:%u here(this=%u)!\n", |
523 | dlm->dlm_reco_thread_task->pid, | 523 | task_pid_nr(dlm->dlm_reco_thread_task), |
524 | dlm->name, dlm->reco.dead_node, dlm->node_num); | 524 | dlm->name, dlm->reco.dead_node, dlm->node_num); |
525 | 525 | ||
526 | status = dlm_remaster_locks(dlm, dlm->reco.dead_node); | 526 | status = dlm_remaster_locks(dlm, dlm->reco.dead_node); |