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: 7326581 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 48D1C9F1D5 for ; Mon, 5 Oct 2015 11:04:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 61EB2206EB for ; Mon, 5 Oct 2015 11:04:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D750206E9 for ; Mon, 5 Oct 2015 11:04:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751619AbbJELC7 (ORCPT ); Mon, 5 Oct 2015 07:02:59 -0400 Received: from mail-qg0-f46.google.com ([209.85.192.46]:34196 "EHLO mail-qg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751552AbbJELC5 (ORCPT ); Mon, 5 Oct 2015 07:02:57 -0400 Received: by qgez77 with SMTP id z77so146015035qge.1 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=fkMrALZ0PylT8wI4dZ38KivWeHlSR8V+7TJe9Jjpr8hx9uzDRnR8czreLyUX0H+ZUR V7G8t//rw708+31Nn/h/ZomOoqXpAnfiurg13KfVZi7kKkFo7uFqSRzybb1XhaasQQub hJXEpTBBEsEKo5ynJb/ReXoLhG/IWVTp+NA/QmPz124xZIbcrGSkG3zpvZhUXSDlxGSe yC9LRxfxxFvaNGyCssuu2/kyoTBAaOVumngX7zT3TqonQweJk4sR8bzgwjbVV2i+1Wty NYLW9/MTTU4M9BDnk4/P1+4zdxy8rFo+T1I+fVeIo047qt1k8pBSQL6RBDrBvWIWQDVY +ncg== X-Gm-Message-State: ALoCoQlylauDZMozvTO6fFpcNVaCPUkZOt4mjqoWyLdb5s4jvyCWXW3X2fSqSKWaI4b16nsQad8I 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-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),