From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E1D733987 for ; Sun, 14 Sep 2025 00:35:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757810112; cv=none; b=L8FYqhfCzOanI2/RDJN6etAY88kdejJcc2mRPwmz797/Fgw+EhNTmN9MOKblgqFuu3qsga84H0nqC0zYy+Io0wjeF2Uea06Os4XyTqJYgf3iFed7bDqdR6iC6dqhyj38dceBwH/HbJIpm5hQwdhNBFxuhpvy2JpW6J710AqzX38= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757810112; c=relaxed/simple; bh=Yzkev6f45UUhFN7Si1nPYnEMXGu8YWTybuSD5TVvKak=; h=Date:To:From:Subject:Message-Id; b=acpVnmEOwxiJ/ewAnWt44vI/GK6mPClwoofCbWOYE6x+1Xuzt2iZPXQ/DvuM4gOWIXCoMb9Znz8O3C+TeTvb8tcH4Rxs3Osavmy026+mMZwFNr2XNwdCPWhBM6xMlCmZHRl7WoomYJZaGkbsq4IUakc4y4FUfcCN84mfrcazwbc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=zSfrZTfB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="zSfrZTfB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A8B0C4CEEB; Sun, 14 Sep 2025 00:35:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1757810112; bh=Yzkev6f45UUhFN7Si1nPYnEMXGu8YWTybuSD5TVvKak=; h=Date:To:From:Subject:From; b=zSfrZTfBAFrBlJfcIAYQ6plCf6sFk8Yq/RpxVzIg2SE6Pfg937g5E0glEqy90eifC B/dnl1Te43qISRe9IXNz/luLhrPMas8L0V6l53eL7JkQR8toJk+YtxxKjl+iHu/bz6 LICJYv1x1Nh7epZQ37y+es7R1PmbQtotlRItHXGU= Date: Sat, 13 Sep 2025 17:35:11 -0700 To: mm-commits@vger.kernel.org,piaojun@huawei.com,nabijaczleweli@nabijaczleweli.xyz,mark.tinguely@oracle.com,mark@fasheh.com,junxiao.bi@oracle.com,joseph.qi@linux.alibaba.com,jlbec@evilplan.org,gechangwei@live.cn,dmantipov@yandex.ru,thorsten.blum@linux.dev,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-nonmm-stable] ocfs2-remove-commented-out-mlog-statements.patch removed from -mm tree Message-Id: <20250914003512.2A8B0C4CEEB@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: ocfs2: remove commented out mlog() statements has been removed from the -mm tree. Its filename was ocfs2-remove-commented-out-mlog-statements.patch This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Thorsten Blum 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 Reviewed-by: Mark Tinguely Reviewed-by: Mark Fasheh Cc: Ahelenia Ziemiańska Cc: Dmitry Antipov Cc: Joel Becker Cc: Joseph Qi Cc: Thorsten Blum Cc: Junxiao Bi Cc: Changwei Ge Cc: Jun Piao Signed-off-by: Andrew Morton --- 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; _ Patches currently in -mm which might be from thorsten.blum@linux.dev are lib-decompress-use-designated-initializers-for-struct-compress_format.patch