From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4B65C76196 for ; Thu, 6 Apr 2023 11:36:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238390AbjDFLgc (ORCPT ); Thu, 6 Apr 2023 07:36:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238307AbjDFLfu (ORCPT ); Thu, 6 Apr 2023 07:35:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4E5DB47A; Thu, 6 Apr 2023 04:33:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8F2CC64694; Thu, 6 Apr 2023 11:32:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6308C433D2; Thu, 6 Apr 2023 11:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680780773; bh=vhRL0CGCmVCvcXUUnHLaB8Q8ykDyIwZGkVjoapmWwvk=; h=From:To:Cc:Subject:Date:From; b=C6oSO/yXg3noD4t6sj+X2CGUoPOmksw7Hu6CkwxJR5M3kMoNAw1jbCkZ0vk5D6RbP 5uGi0a+emRHfgNmMv5Y0JTMviWA1FhwfaOAJ5DnWFYs48aiKqZf9HXZxvY0E79eM6H d93bp9792UUqwG5ysGWYiNtsUyv0XSBXGQn6NbRn21OYUwdey1ChoIIs67f9TKvivI NOKPz6S5Ng3G7mlCpe6AY4fcpY/io8AIqBAzJ8mGAQboRKVfRRBIT9FpOYAkh8EMLj vmuvlTuS+u0NxbfH2k1hitA6EdPVj+KNkiU2B0wYz0k9dz8IMbuVkxCIWXCbhXhcAQ fgSPop07GfWFg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Douglas Raillard , Mukesh Ojha , Chao Yu , Jaegeuk Kim , Sasha Levin , rostedt@goodmis.org, mhiramat@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-trace-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 01/11] f2fs: Fix f2fs_truncate_partial_nodes ftrace event Date: Thu, 6 Apr 2023 07:32:40 -0400 Message-Id: <20230406113250.648634-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-trace-kernel@vger.kernel.org From: Douglas Raillard [ Upstream commit 0b04d4c0542e8573a837b1d81b94209e48723b25 ] Fix the nid_t field so that its size is correctly reported in the text format embedded in trace.dat files. As it stands, it is reported as being of size 4: field:nid_t nid[3]; offset:24; size:4; signed:0; Instead of 12: field:nid_t nid[3]; offset:24; size:12; signed:0; This also fixes the reported offset of subsequent fields so that they match with the actual struct layout. Signed-off-by: Douglas Raillard Reviewed-by: Mukesh Ojha Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- include/trace/events/f2fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index 4cb055af1ec0b..f5dcf7c9b7076 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -513,7 +513,7 @@ TRACE_EVENT(f2fs_truncate_partial_nodes, TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) - __field(nid_t, nid[3]) + __array(nid_t, nid, 3) __field(int, depth) __field(int, err) ), -- 2.39.2