[v1] ocfs2: Remove commented out mlog() statements

[PATCH] ocfs2: Remove commented out mlog() statements

Posted by Thorsten Blum 1 month, 3 weeks ago

The mlog() statements have been commented out ever since commit
6714d8e86bf44 ("[PATCH] OCFS2: The Second Oracle Cluster Filesystem") -
remove them.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 fs/ocfs2/dlm/dlmmaster.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 86bb1a03bcc1..4145e06d2c08 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -1477,7 +1477,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
 			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 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
 			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 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
 		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 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
 			} 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 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
 	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 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
 			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 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data,
 		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;
-- 
2.50.1

Re: [External] : [PATCH] ocfs2: Remove commented out mlog() statements

Posted by Mark Tinguely 1 month, 3 weeks ago

On 8/13/25 1:06 PM, Thorsten Blum wrote:
> The mlog() statements have been commented out ever since commit
> 6714d8e86bf44 ("[PATCH] OCFS2: The Second Oracle Cluster Filesystem") -
> remove them.
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
>   fs/ocfs2/dlm/dlmmaster.c | 11 -----------
>   1 file changed, 11 deletions(-)
> 
> diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
> index 86bb1a03bcc1..4145e06d2c08 100644
> --- a/fs/ocfs2/dlm/dlmmaster.c
> +++ b/fs/ocfs2/dlm/dlmmaster.c
> @@ -1477,7 +1477,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
>   			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 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
>   			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 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
>   		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 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
>   			} 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 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
>   	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 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
>   			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 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data,
>   		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;


Looks good to me
Did you want to remove the one in fs/ocfs2/dlm/dlmrecovery.c from the 
smae commit also?

diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 00f52812dbb0..843ee02bd85f 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -464,7 +464,6 @@ static int dlm_do_recovery(struct dlm_ctxt *dlm)
         }

         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;



Reviewd-by: Mark Tinguely <mark.tinguely@oracle.com>

Re: [External] : [PATCH] ocfs2: Remove commented out mlog() statements

Posted by Thorsten Blum 1 month, 3 weeks ago

Hi Mark,

On 13. Aug 2025, at 22:33, Mark Tinguely wrote:
> Did you want to remove the one in fs/ocfs2/dlm/dlmrecovery.c from the smae commit also?

Yes, I'll just submit a v2 tomorrow.

> Reviewd-by: Mark Tinguely <mark.tinguely@oracle.com>

I'll keep your Reviewed-by tag in v2 if that's ok and fix the typo :)

Thanks,
Thorsten