Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp3181455rwb; Mon, 3 Oct 2022 10:50:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5JUj3tTipyJMed945POrsKmRR+FptvfzfxNYCo/ZvBznqo5NKUCBmv6sdYlbuD5ga7p76X X-Received: by 2002:a17:903:1110:b0:178:9f67:b524 with SMTP id n16-20020a170903111000b001789f67b524mr23775524plh.50.1664819411910; Mon, 03 Oct 2022 10:50:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664819411; cv=none; d=google.com; s=arc-20160816; b=Zag5L4JFvlMEQRAW75oCgLT3ok5KsYCjH6LDE7GqIl3tpD+MUSsngH/4J3FCWN8uEe cNW/5fdPzpCvxHB03v6BeJ7tEZA/G2EfpKciQYtWhZe+SsIj/aGvwdOM7tW/3GGQscsY oKy88l/88OHLLwbEbAHOsEQWE6k+CPkYaiZjmrye6uUIyQZ+rAzaEgTp7j+ZriQKGVN5 WIGJn9Rpv+OlUuCbTy6HHSUeeL7cpOzmrryHwoP13kNNMBHOpoA5Cpvx+RYZp5SJlVNR mz8hCoTqRQrL8LONlPuSAhufhbJ+24jcTeaoywLAhRAV2FwuzLstedjXLaHiP0u2i22U rwqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=PaGkAAx/KQiQeXzej3kJpAyNFcFbyw0Q+qVOmDcOQyw=; b=X5ytpbD7nHU4Zo6uJhqqq+Qir7fg+WqCILKvmnBUnXwNq4DZ7wstzq4iGIGJVBFOz0 9S965tB60XM8FLOnxvljZLdVpc3iIb02Y33GCNdWnxy2QItU0D//OsT8lzeCIWqMwsSl 0/zCY9nkcpY4MOjJTMcLjrqcQtcL8K2tWBeiwuKx2FEPXL02JAiSmdMrXCPH7vHbVu78 p3ZAhkvCbNeYTi2LSIbKHeRuQbctgYbYjgHdSaba5gqAu2a8E4zxJTF69b2NqZxe+WY4 zkzMSk4GcnEsfkPjidNk5UGvOXpZ3DlRFHo1W8+RacSyDKb6XKgkLeIEHSGHZUkFQ5iF YmNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qQmyhtr5; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 84-20020a630057000000b00440bbdf5abbsi9997199pga.104.2022.10.03.10.49.25; Mon, 03 Oct 2022 10:50:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qQmyhtr5; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229679AbiJCRop (ORCPT + 99 others); Mon, 3 Oct 2022 13:44:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229672AbiJCRom (ORCPT ); Mon, 3 Oct 2022 13:44:42 -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 D213A304 for ; Mon, 3 Oct 2022 10:44:35 -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 6F3E461193 for ; Mon, 3 Oct 2022 17:44:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DD4DC433D6; Mon, 3 Oct 2022 17:44:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664819074; bh=5GTGL4ViTtMMjSNBZ5MZJEzv17jU75OEbJty7Qu+baU=; h=From:To:Cc:Subject:Date:From; b=qQmyhtr56WTi20Feh1Apa0fKrh6m3Ov09Px1fMYHf8B6u1ijWy5XH87RWD3OzRqTG ihs7sGwMMMpjRY8eFLLCVGo5KlW4EVY4yZ4QBhfIyxBGYhVgxiZBr3Mil1t96v/WLU tEB2oBsal/xAXsYRGcfHLc1q4Q5Geu8JWust4unM7qYrDAQmNPxjXVsgzI2TJofmAZ AV10q8sga8XtOiudxE9cwqc5RT89pRIOEEsxb7w6DLv24XFhxlntEUOE+exusPVCR7 UI1JUw8n8hQtEu6C4OdZuHSkFiWEiei4Nta3yxW+7wPPHawtpJZzOYWf7G2xqlPZfs rbailgY+s3jnw== From: Anna Schumaker To: linux-nfs@vger.kernel.org, trond.myklebust@hammerspace.com Cc: anna@kernel.org Subject: [PATCH 1/3] NFSv4.2: Move TRACE_DEFINE_ENUM(NFS4_CONTENT_*) under CONFIG_NFS_V4_2 Date: Mon, 3 Oct 2022 13:44:31 -0400 Message-Id: <20221003174433.476685-1-anna@kernel.org> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker NFS4_CONTENT_DATA and NFS4_CONTENT_HOLE both only exist under NFS v4.2. Move their corresponding TRACE_DEFINE_ENUM calls under this Kconfig option. Signed-off-by: Anna Schumaker --- fs/nfs/nfs4trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index 6ee6ad3674a2..37c4c105ed29 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h @@ -2097,6 +2097,7 @@ TRACE_EVENT(ff_layout_commit_error, ) ); +#ifdef CONFIG_NFS_V4_2 TRACE_DEFINE_ENUM(NFS4_CONTENT_DATA); TRACE_DEFINE_ENUM(NFS4_CONTENT_HOLE); @@ -2105,7 +2106,6 @@ TRACE_DEFINE_ENUM(NFS4_CONTENT_HOLE); { NFS4_CONTENT_DATA, "DATA" }, \ { NFS4_CONTENT_HOLE, "HOLE" }) -#ifdef CONFIG_NFS_V4_2 TRACE_EVENT(nfs4_llseek, TP_PROTO( const struct inode *inode, -- 2.37.3