From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f2.google.com (mail-wm2-f2.google.com [74.125.225.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE1FB17AE11 for ; Sat, 15 Aug 2026 14:31:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786804289; cv=none; b=tY8FHArrLvi+bXSv3sd1H4lea5vva3EE91PtNGE+WI/GIdpcBlFcawOufZzcqpH/rHCoMK8zsbhaeFy+TlLaFmux9FtmnOQK7Ai023OslVQ08onuuRY209ah7YklDHMiSVxCvsBnt0wPzXPNWZtBB0Jtcb878LluPGhVh3hXqNY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786804289; c=relaxed/simple; bh=9zz8Gp1TJv1jrYb6vEA6wfZ/VLzUdjP0KgIh77ttoO8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=APbM/XGaMLvsoH0JUMqRUHUAn4KjhlxBMYXHdj5mBeaVSrHKl7elPkA5M4M6hPH6S/BgH2BW3ewvCGtTRctjHSyTlnjGNc/IDXsnKCUj9rpa0ISk6uFi6jwVUQznNCo+blGoGKjeVHZe6oKVwUX7BaCcPNNaYtBfL49Wygt7A4Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FdsJOTap; arc=none smtp.client-ip=74.125.225.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FdsJOTap" Received: by mail-wm2-f2.google.com with SMTP id 5b1f17b1804b1-4926d058720so4669015e9.0 for ; Sat, 15 Aug 2026 07:31:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786804286; x=1787409086; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=Vgs6AOcx4CaUB67rv6dy2Cg2Qla+WNDbQRNX2dCqX6U=; b=FdsJOTapmY8xUkYWeW79Kamf6sNpZvZGMJJw5fuWYt6KXp2QRVMj7xpXqWhT4wq3EL uitfcLH8xO5a8TMdtu5m1+akm7xUwhCbernvVJRuX4nzhg6xfqXBRG9oDJH8jOxHmoa4 Zc71ATqy2bnlcSFohue9bFRIhOnZ3rNygUdMTZ3ycpdXnXSZp67UPcjnNg9QgkFM+TRj ynSXMNzkc2v2DT5MxkFxdcL3KwTqHlij1UzzUA9P6pKmZM26sU+zx4hEmlwl7Kv59AK1 WlGi2nXn547O3tmE4lvR9RhSFDjMVBL613jmCk9Q0TmBy8iqsvWrZRBxr7lUIiP/K0S9 WY1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786804286; x=1787409086; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Vgs6AOcx4CaUB67rv6dy2Cg2Qla+WNDbQRNX2dCqX6U=; b=DuVXN6ZUAcv7RYWyAyiKvKHUaPJcbvNFXZRNR5LIp1nNUIa9ipTpQ9VcISKiyC4nac Gr3+fxDU1MIII0aI7ULOT5/bv8KhHKpE2SdPyCLF9auFJx5KEkE4m/RPjiAcBzBi3g9k A0c34k+FUKO/xXRDNRv2oRbw0dna+CZ7mvB82IinkCkzdyI2yrj2bbtd39RA22XMXqCZ fjD8qbzMV/1ANxWhdwv8Z66etpfzOmu+bLKIWWiKGm9WUH6pT9f1bpuKK2rz2Jum4NO6 CxfysCp9etzfAmk4Lqxcw/evAeVOczVW/kWNZs+Iiy1ZPuPRhf2hQF6EDz9Oy89x0n4R 1rYw== X-Forwarded-Encrypted: i=1; AHgh+RplWma/d2FVNATWLaCTU43OiUrnfq64Wt5xZgaA7J+YZwxGunniqiRsTKvQY5ChZLsT+HOexn35O99Qpyg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy46ZyHE9kHVZqFIaSnxv+UBu5xBIgjr9bAAMQrJf2JilQuf12H 0yswubBZOIx0HjuaASaD1phA7AdaMzK3IoNy/M0KEAgsMll43NcCphQH X-Gm-Gg: AR+sD13FqTwiyLseVjpUU6UkYNvEN6LNDJ+xgTNmPWweD6f2ZEVGok38mxEbjWQNQUp TBxaOcVzvufRCcrzZg4SKlT9Nv14NMycMHb7QkuRad9C/6Fa9eDR6Rm2U3S6Cz1xiAAxecIKWm+ lWtUjdse1R3fC2zKOkpkHUYNhRQ28v0tj/mIOn+sGmCOnsSsjXm9sbFx4W1nRmsoGcPe5M90NuD kjrv9TDuSjmLVVLRQsw0B7ySzs8cfjVY2C8+iysbVrvkZ60ZfUg953t5SZwjn6vAQWZR9ZtPJ+Y ngqBrterufoChVp0Ci8vxxXFDK1lnZz2PDdDJqfO8bCiBWROv/4YgFwyTMt7TFa6aNKp7bnWw8c SYBsJNk78nNvP+PthKVhI5cDpxyu0+vaYYgAotW5BCLmIU05seol0gdzK2jhwlh6OloQjmsA1jO ZJfpTb2ER4jgAOJq8fDGXPobCpTeFuLANViI5GsoxZe8IiiRkjp9EpsSNZJ9NxEJxO7ygteHLSh AIPpWe1y2Ixg1ieLAjBBxI0s0g6UARh2Vsw/+7P+0oiGIT66Ehn3q+IyUdyXKojNREyk7H/tvvi j8VrEkoUvkQZPgOls0Y= X-Received: by 2002:a05:600c:4e04:b0:499:9069:c2c9 with SMTP id 5b1f17b1804b1-4999069cf2bmr75580105e9.11.1786804285834; Sat, 15 Aug 2026 07:31:25 -0700 (PDT) Received: from lima-kernel.telekom.ip (84-115-221-9.cable.dynamic.surfer.at. [84.115.221.9]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49988b24746sm251357515e9.12.2026.08.15.07.31.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2026 07:31:25 -0700 (PDT) From: Jaeyeon Lee To: sj@kernel.org, akpm@linux-foundation.org Cc: shu17az@gmail.com, jiayuan.chen@shopee.com, jaeyeon.lee.dev@gmail.com, damon@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/damon/tests: use scoped_guard() for damon_test_ops_registration Date: Sat, 15 Aug 2026 16:30:39 +0200 Message-ID: <20260815143039.17291-1-jaeyeon.lee.dev@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace manual mutex_lock() and mutex_unlock() calls with the scoped_guard() macro. This simplifies the code, improves readability, and ensures that the lock is automatically released when the scope ends, preventing potential lock leaks in the future. Signed-off-by: Jaeyeon Lee --- mm/damon/tests/core-kunit.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mm/damon/tests/core-kunit.h b/mm/damon/tests/core-kunit.h index 4a536d41cdb2..770927a30021 100644 --- a/mm/damon/tests/core-kunit.h +++ b/mm/damon/tests/core-kunit.h @@ -434,17 +434,17 @@ static void damon_test_ops_registration(struct kunit *test) KUNIT_EXPECT_EQ(test, damon_select_ops(c, NR_DAMON_OPS), -EINVAL); /* Registration should success after unregistration */ - mutex_lock(&damon_ops_lock); - bak = damon_registered_ops[DAMON_OPS_VADDR]; - damon_registered_ops[DAMON_OPS_VADDR] = (struct damon_operations){}; - mutex_unlock(&damon_ops_lock); + scoped_guard(mutex, &damon_ops_lock) { + bak = damon_registered_ops[DAMON_OPS_VADDR]; + damon_registered_ops[DAMON_OPS_VADDR] = + (struct damon_operations){}; + } ops.id = DAMON_OPS_VADDR; KUNIT_EXPECT_EQ(test, damon_register_ops(&ops), 0); - mutex_lock(&damon_ops_lock); - damon_registered_ops[DAMON_OPS_VADDR] = bak; - mutex_unlock(&damon_ops_lock); + scoped_guard(mutex, &damon_ops_lock) + damon_registered_ops[DAMON_OPS_VADDR] = bak; /* Check double-registration failure again */ KUNIT_EXPECT_EQ(test, damon_register_ops(&ops), -EINVAL); @@ -452,10 +452,9 @@ static void damon_test_ops_registration(struct kunit *test) damon_destroy_ctx(c); if (need_cleanup) { - mutex_lock(&damon_ops_lock); - damon_registered_ops[DAMON_OPS_VADDR] = - (struct damon_operations){}; - mutex_unlock(&damon_ops_lock); + scoped_guard(mutex, &damon_ops_lock) + damon_registered_ops[DAMON_OPS_VADDR] = + (struct damon_operations){}; } } -- 2.43.0