From patchwork Fri Sep 11 10:54:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7159391 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1E6689F380 for ; Fri, 11 Sep 2015 10:55:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5288C2085A for ; Fri, 11 Sep 2015 10:55:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A50420855 for ; Fri, 11 Sep 2015 10:55:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752796AbbIKKzE (ORCPT ); Fri, 11 Sep 2015 06:55:04 -0400 Received: from mail-yk0-f176.google.com ([209.85.160.176]:34869 "EHLO mail-yk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752782AbbIKKy7 (ORCPT ); Fri, 11 Sep 2015 06:54:59 -0400 Received: by ykdu9 with SMTP id u9so87603639ykd.2 for ; Fri, 11 Sep 2015 03:54:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MJ0aLVqcNkWwDKqPLB2V6fUjXcn1Vyt5mnGPaczPGuI=; b=ej/IG5fMKfX5X1aZFGnLn20xbMTEweIh7QzyYP3QYl12loRN0AeZLe1/di9QzYmCC/ quHTsdvPnWpz+K7FhaiBuTjII6iJpEsPrs3+ztaGRDUYtPaHecvoi3ojxvraAShPbaXk 7xdZJDMSAqqVUmu1JwPaljyjEfX45y4CLR2/9QLLDRR2gdfxK2V2GOPF+1BDB+pxrDlr 0+4pFagWY8D0+f5o9zq5gCuET8OPLzexuQ8LHHxzUmZi6I6m5GMUTLGcbov/w7BUDvx9 ss/XyVAI2ddKvxEI1zGqFUCOVVVV25XC/kjYWU4CyvnX1A9cSB/b31YsMPXv70ojXwtG CTyQ== X-Gm-Message-State: ALoCoQkQ/j2DhVjQO9Nd+BOZg47CiHhDiCIt1jwhH8GBfeUjXEqUhROpOMy5Aaty3jSKN/XXNTQN X-Received: by 10.129.78.85 with SMTP id c82mr36522963ywb.133.1441968898933; Fri, 11 Sep 2015 03:54:58 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1105:8e:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id u8sm489915ywe.17.2015.09.11.03.54.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2015 03:54:58 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v4 06/16] nfsd: move include of state.h from trace.c to trace.h Date: Fri, 11 Sep 2015 06:54:32 -0400 Message-Id: <1441968882-7851-7-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1441968882-7851-1-git-send-email-jeff.layton@primarydata.com> References: <1441968882-7851-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Any file which includes trace.h will need to include state.h, even if they aren't using any state tracepoints. Ensure that we include any headers that might be needed in trace.h instead of relying on the *.c files to have the right ones. Signed-off-by: Jeff Layton Reviewed-by: Christoph Hellwig --- fs/nfsd/trace.c | 2 -- fs/nfsd/trace.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/trace.c b/fs/nfsd/trace.c index 82f89070594c..90967466a1e5 100644 --- a/fs/nfsd/trace.c +++ b/fs/nfsd/trace.c @@ -1,5 +1,3 @@ -#include "state.h" - #define CREATE_TRACE_POINTS #include "trace.h" diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index c668520c344b..0befe762762b 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -9,6 +9,8 @@ #include +#include "state.h" + DECLARE_EVENT_CLASS(nfsd_stateid_class, TP_PROTO(stateid_t *stp), TP_ARGS(stp),