| From: Thorsten Blum <thorsten.blum@linux.dev> |
| Subject: ocfs2: remove commented out mlog() statements |
| Date: Thu, 14 Aug 2025 13:38:10 +0200 |
| |
| The mlog() statements have been commented out ever since commit |
| 6714d8e86bf44 ("[PATCH] OCFS2: The Second Oracle Cluster Filesystem") - |
| remove them. |
| |
| Link: https://lkml.kernel.org/r/20250814113815.219064-1-thorsten.blum@linux.dev |
| Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> |
| Reviewed-by: Mark Tinguely <mark.tinguely@oracle.com> |
| Reviewed-by: Mark Fasheh <mark@fasheh.com> |
| Cc: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> |
| Cc: Dmitry Antipov <dmantipov@yandex.ru> |
| Cc: Joel Becker <jlbec@evilplan.org> |
| Cc: Joseph Qi <joseph.qi@linux.alibaba.com> |
| Cc: Thorsten Blum <thorsten.blum@linux.dev> |
| Cc: Junxiao Bi <junxiao.bi@oracle.com> |
| Cc: Changwei Ge <gechangwei@live.cn> |
| Cc: Jun Piao <piaojun@huawei.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| fs/ocfs2/dlm/dlmmaster.c | 11 ----------- |
| fs/ocfs2/dlm/dlmrecovery.c | 1 - |
| 2 files changed, 12 deletions(-) |
| |
| --- a/fs/ocfs2/dlm/dlmmaster.c~ocfs2-remove-commented-out-mlog-statements |
| +++ a/fs/ocfs2/dlm/dlmmaster.c |
| @@ -1477,7 +1477,6 @@ way_up_top: |
| goto send_response; |
| } else if (res->owner != DLM_LOCK_RES_OWNER_UNKNOWN) { |
| spin_unlock(&res->spinlock); |
| - // mlog(0, "node %u is the master\n", res->owner); |
| response = DLM_MASTER_RESP_NO; |
| if (mle) |
| kmem_cache_free(dlm_mle_cache, mle); |
| @@ -1493,7 +1492,6 @@ way_up_top: |
| BUG(); |
| } |
| |
| - // mlog(0, "lockres is in progress...\n"); |
| spin_lock(&dlm->master_lock); |
| found = dlm_find_mle(dlm, &tmpmle, name, namelen); |
| if (!found) { |
| @@ -1503,8 +1501,6 @@ way_up_top: |
| set_maybe = 1; |
| spin_lock(&tmpmle->spinlock); |
| if (tmpmle->type == DLM_MLE_BLOCK) { |
| - // mlog(0, "this node is waiting for " |
| - // "lockres to be mastered\n"); |
| response = DLM_MASTER_RESP_NO; |
| } else if (tmpmle->type == DLM_MLE_MIGRATION) { |
| mlog(0, "node %u is master, but trying to migrate to " |
| @@ -1531,8 +1527,6 @@ way_up_top: |
| } else |
| response = DLM_MASTER_RESP_NO; |
| } else { |
| - // mlog(0, "this node is attempting to " |
| - // "master lockres\n"); |
| response = DLM_MASTER_RESP_MAYBE; |
| } |
| if (set_maybe) |
| @@ -1559,7 +1553,6 @@ way_up_top: |
| found = dlm_find_mle(dlm, &tmpmle, name, namelen); |
| if (!found) { |
| /* this lockid has never been seen on this node yet */ |
| - // mlog(0, "no mle found\n"); |
| if (!mle) { |
| spin_unlock(&dlm->master_lock); |
| spin_unlock(&dlm->spinlock); |
| @@ -1573,8 +1566,6 @@ way_up_top: |
| goto way_up_top; |
| } |
| |
| - // mlog(0, "this is second time thru, already allocated, " |
| - // "add the block.\n"); |
| dlm_init_mle(mle, DLM_MLE_BLOCK, dlm, NULL, name, namelen); |
| set_bit(request->node_idx, mle->maybe_map); |
| __dlm_insert_mle(dlm, mle); |
| @@ -1897,8 +1888,6 @@ ok: |
| spin_unlock(&res->spinlock); |
| } |
| |
| - // mlog(0, "woo! got an assert_master from node %u!\n", |
| - // assert->node_idx); |
| if (mle) { |
| int extra_ref = 0; |
| int nn = -1; |
| --- a/fs/ocfs2/dlm/dlmrecovery.c~ocfs2-remove-commented-out-mlog-statements |
| +++ a/fs/ocfs2/dlm/dlmrecovery.c |
| @@ -464,7 +464,6 @@ static int dlm_do_recovery(struct dlm_ct |
| } |
| |
| if (dlm->reco.dead_node == O2NM_INVALID_NODE_NUM) { |
| - // mlog(0, "nothing to recover! sleeping now!\n"); |
| spin_unlock(&dlm->spinlock); |
| /* return to main thread loop and sleep. */ |
| return 0; |
| _ |