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 67EE8C77B71 for ; Thu, 6 Apr 2023 11:35:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238179AbjDFLfz (ORCPT ); Thu, 6 Apr 2023 07:35:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238166AbjDFLfY (ORCPT ); Thu, 6 Apr 2023 07:35:24 -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 450BDAD13; Thu, 6 Apr 2023 04:33:38 -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 CC01960C8A; Thu, 6 Apr 2023 11:33:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30B99C433D2; Thu, 6 Apr 2023 11:33:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680780798; bh=j3/iw94mKIuIrszdGI4ABTDK7tgs5kCINVzSTavDhAs=; h=From:To:Cc:Subject:Date:From; b=WNSd6aR+ezYQQVgm4Lz+/Bi2nkE7RxhOy4KJmeV4Af7Exdnp6+D2iqVshefIbpWPK nHUjgY79AyWiT4D8PhWw7vim5Z/9ybKGdT3ZUBwldXAESjDh/AhTYlrcNbZIzghjtV mH27sh8K3eNxDf/qPoYegY1NJrw9fXdU+GXaaxxcHMPuVnAD2AL98zB/yoTajSjJ4G 2E8bPg49D7VRIPW2UGfdo3iVbN7eagTF2IrT2qZDeE1Cle0v3UomCKFaC6JA8t2rfp xvhuIQG5I8b6f2lhaxsotK3QCAq69KzmSmvHL2yucAJJmTAjJo5jFTK+4xljNA/VLe 5areM3NU4fmPg== 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.10 1/9] f2fs: Fix f2fs_truncate_partial_nodes ftrace event Date: Thu, 6 Apr 2023 07:33:07 -0400 Message-Id: <20230406113315.648777-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 df293bc7f03b8..e8cd19e91de11 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