From patchwork Mon Oct 5 11:02:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7326591 Return-Path: X-Original-To: patchwork-linux-nfs@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 23A529F6E4 for ; Mon, 5 Oct 2015 11:04:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56331206E9 for ; Mon, 5 Oct 2015 11:04:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AAD9206F8 for ; Mon, 5 Oct 2015 11:04:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751713AbbJELC7 (ORCPT ); Mon, 5 Oct 2015 07:02:59 -0400 Received: from mail-qg0-f50.google.com ([209.85.192.50]:32947 "EHLO mail-qg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751619AbbJELC5 (ORCPT ); Mon, 5 Oct 2015 07:02:57 -0400 Received: by qgev79 with SMTP id v79so145481408qge.0 for ; Mon, 05 Oct 2015 04:02:56 -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=c/X52zcjSrlvAfphKXQ8rv2IV1hRMM99PuCACsUMok1ANXJXc2/e78j5PTvhm5+Ghi NLwf6DL32jUCxt3VSwPqB4QbbM8S/cIqk7zyE7sUgWnBSxrH3OT9AqEbplgJFEZtRlck eKB5wja7TKkQijXziEAQN+NKrOyEMwk3aBD8QIjVUGgM9GBcSoGUXNG0JJ2s5Zo8aHhc YskcbLKM0Y5haoRJXjQ8vjsHes4OUeSih8R1gh3qu8UBEaGs4lgctu6pqC/8E+sD3mWk PWbB/Ntr1u6PA5TgQz4z4xkFlYuEb3qs///ctsk2wr2lIKcZuFXHgYUygV3XP4LNf6bN 9t7Q== X-Gm-Message-State: ALoCoQlmX9hKFw5yJumEPz4AnomZqGl2ejJ5t3R7oqlAi6w1K/reXflYoAR5XMa1FHEcc0rlixaB X-Received: by 10.140.217.146 with SMTP id n140mr40519958qhb.27.1444042976350; Mon, 05 Oct 2015 04:02:56 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:6079::d5a]) by smtp.googlemail.com with ESMTPSA id p39sm4977719qkp.47.2015.10.05.04.02.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Oct 2015 04:02:55 -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, Al Viro Subject: [PATCH v5 08/20] nfsd: move include of state.h from trace.c to trace.h Date: Mon, 5 Oct 2015 07:02:30 -0400 Message-Id: <1444042962-6947-9-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444042962-6947-1-git-send-email-jeff.layton@primarydata.com> References: <1444042962-6947-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@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),