From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 79A6742314D for ; Fri, 22 May 2026 14:35:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779460505; cv=none; b=dfx+jO7/ng25UKW7kOhanA+SJZCcqkrIX/1gPVtUarvTXbVUTPpw6WSYLhLg3NLwjxiOtW/SXGemI7BBu8pDZzDvt3cttTl+uyAJsCVpiD21Iqb91dJOZM6CkqygR1IbpTxE1Gas6RmPqCkyBXwz7D8p6+EJR+nrK7oRjtt8yMI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779460505; c=relaxed/simple; bh=g8zWk/Auc+O62tHUgG59rP/1B1peQZ6Yc4dTuqzongY=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=KPjxwPHGYKGbNtevtQX+N08ksl9J6ZnMRUTqXtoNl36m4bIyH1iwmafcZjOhhdV9QyMquwVsx81EKdHTo4RyeJTlPk6yJ6us+sH/75VdRpVn8H7zJ1LIzeeoIipcWbap16Pxz4ftUv8ivDoOxXfa3p6Ex/++PkVFfuDCQVyWpBk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SmVYEAP7; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SmVYEAP7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76B6A1F0155C; Fri, 22 May 2026 14:35:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779460502; bh=f35kLwIfuNqRDzKotxTnqiCUvLtAR1AirFdxdYehEGo=; h=Date:From:To:Cc:Subject:References; b=SmVYEAP77kjA9zq1XpQg54Z8qzhzrqMVlzcZPjx2WpUdpFo7sq7lS7oeTO3UANzuD GprOgkA3rVbq+W8MPF5q0l1HTlFqOF0VfVHUatEdpVfij1+tDhj6Cr6HmKR7mkkw01 U2Yzay+TQXTCCpnMJRtA88HZRbUVABii0ytUNrbmAkyQCf3o0qZhUJfwdSnqT8PMQP zfOoXWtngCMTbFnQsWm18mn+zrQSt6IvQy7Xy5AFlU0+kayhsvtIBFLugahGMSxcOZ AX1lRUy3X33BR2cdLq32L7kHOZZoC7+2b82rOMVtp+6LFG3/D++r4BofIcOwAb7vrx iIvHxbYRYsVXQ== Received: from rostedt by gandalf with local (Exim 4.99.2) (envelope-from ) id 1wQQyE-0000000668b-0A07; Fri, 22 May 2026 10:35:26 -0400 Message-ID: <20260522143525.896753113@kernel.org> User-Agent: quilt/0.69 Date: Fri, 22 May 2026 10:35:14 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Yash Suthar Subject: [for-next][PATCH 06/15] tracing: Switch trace_recursion_record.c code over to use guard() References: <20260522143508.298439732@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 From: Yash Suthar Switch mutex_lock()/mutex_unlock() to guard(). also drop the ret local variable and return directly. Link: https://patch.msgid.link/20260502174741.39636-1-yashsuthar983@gmail.com Signed-off-by: Yash Suthar Signed-off-by: Steven Rostedt --- kernel/trace/trace_recursion_record.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kernel/trace/trace_recursion_record.c b/kernel/trace/trace_recursion_record.c index 784fe1fbb866..bac4bc844ccd 100644 --- a/kernel/trace/trace_recursion_record.c +++ b/kernel/trace/trace_recursion_record.c @@ -180,9 +180,8 @@ static const struct seq_operations recursed_function_seq_ops = { static int recursed_function_open(struct inode *inode, struct file *file) { - int ret = 0; + guard(mutex)(&recursed_function_lock); - mutex_lock(&recursed_function_lock); /* If this file was opened for write, then erase contents */ if ((file->f_mode & FMODE_WRITE) && (file->f_flags & O_TRUNC)) { /* disable updating records */ @@ -194,10 +193,9 @@ static int recursed_function_open(struct inode *inode, struct file *file) atomic_set(&nr_records, 0); } if (file->f_mode & FMODE_READ) - ret = seq_open(file, &recursed_function_seq_ops); - mutex_unlock(&recursed_function_lock); + return seq_open(file, &recursed_function_seq_ops); - return ret; + return 0; } static ssize_t recursed_function_write(struct file *file, -- 2.53.0