Skip to content

Commit 9a0ee37

Browse files
tobluxakpm00
authored andcommitted
ocfs2: remove commented out mlog() statements
The mlog() statements have been commented out ever since commit 6714d8e ("[PATCH] OCFS2: The Second Oracle Cluster Filesystem") - remove them. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Thorsten Blum <[email protected]> Reviewed-by: Mark Tinguely <[email protected]> Reviewed-by: Mark Fasheh <[email protected]> Cc: Ahelenia Ziemiańska <[email protected]> Cc: Dmitry Antipov <[email protected]> Cc: Joel Becker <[email protected]> Cc: Joseph Qi <[email protected]> Cc: Thorsten Blum <[email protected]> Cc: Junxiao Bi <[email protected]> Cc: Changwei Ge <[email protected]> Cc: Jun Piao <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent bc107a6 commit 9a0ee37

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

fs/ocfs2/dlm/dlmmaster.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
14771477
goto send_response;
14781478
} else if (res->owner != DLM_LOCK_RES_OWNER_UNKNOWN) {
14791479
spin_unlock(&res->spinlock);
1480-
// mlog(0, "node %u is the master\n", res->owner);
14811480
response = DLM_MASTER_RESP_NO;
14821481
if (mle)
14831482
kmem_cache_free(dlm_mle_cache, mle);
@@ -1493,7 +1492,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
14931492
BUG();
14941493
}
14951494

1496-
// mlog(0, "lockres is in progress...\n");
14971495
spin_lock(&dlm->master_lock);
14981496
found = dlm_find_mle(dlm, &tmpmle, name, namelen);
14991497
if (!found) {
@@ -1503,8 +1501,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
15031501
set_maybe = 1;
15041502
spin_lock(&tmpmle->spinlock);
15051503
if (tmpmle->type == DLM_MLE_BLOCK) {
1506-
// mlog(0, "this node is waiting for "
1507-
// "lockres to be mastered\n");
15081504
response = DLM_MASTER_RESP_NO;
15091505
} else if (tmpmle->type == DLM_MLE_MIGRATION) {
15101506
mlog(0, "node %u is master, but trying to migrate to "
@@ -1531,8 +1527,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
15311527
} else
15321528
response = DLM_MASTER_RESP_NO;
15331529
} else {
1534-
// mlog(0, "this node is attempting to "
1535-
// "master lockres\n");
15361530
response = DLM_MASTER_RESP_MAYBE;
15371531
}
15381532
if (set_maybe)
@@ -1559,7 +1553,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
15591553
found = dlm_find_mle(dlm, &tmpmle, name, namelen);
15601554
if (!found) {
15611555
/* this lockid has never been seen on this node yet */
1562-
// mlog(0, "no mle found\n");
15631556
if (!mle) {
15641557
spin_unlock(&dlm->master_lock);
15651558
spin_unlock(&dlm->spinlock);
@@ -1573,8 +1566,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
15731566
goto way_up_top;
15741567
}
15751568

1576-
// mlog(0, "this is second time thru, already allocated, "
1577-
// "add the block.\n");
15781569
dlm_init_mle(mle, DLM_MLE_BLOCK, dlm, NULL, name, namelen);
15791570
set_bit(request->node_idx, mle->maybe_map);
15801571
__dlm_insert_mle(dlm, mle);
@@ -1897,8 +1888,6 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data,
18971888
spin_unlock(&res->spinlock);
18981889
}
18991890

1900-
// mlog(0, "woo! got an assert_master from node %u!\n",
1901-
// assert->node_idx);
19021891
if (mle) {
19031892
int extra_ref = 0;
19041893
int nn = -1;

fs/ocfs2/dlm/dlmrecovery.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,6 @@ static int dlm_do_recovery(struct dlm_ctxt *dlm)
464464
}
465465

466466
if (dlm->reco.dead_node == O2NM_INVALID_NODE_NUM) {
467-
// mlog(0, "nothing to recover! sleeping now!\n");
468467
spin_unlock(&dlm->spinlock);
469468
/* return to main thread loop and sleep. */
470469
return 0;

0 commit comments

Comments
 (0)