From patchwork Tue Oct 20 17:33:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7449211 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 AA4CC9F1C3 for ; Tue, 20 Oct 2015 17:34:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D36C72083B for ; Tue, 20 Oct 2015 17:34:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED61E20842 for ; Tue, 20 Oct 2015 17:34:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753014AbbJTReC (ORCPT ); Tue, 20 Oct 2015 13:34:02 -0400 Received: from mail-qg0-f52.google.com ([209.85.192.52]:33255 "EHLO mail-qg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752982AbbJTRd7 (ORCPT ); Tue, 20 Oct 2015 13:33:59 -0400 Received: by qgeo38 with SMTP id o38so21852538qge.0 for ; Tue, 20 Oct 2015 10:33:58 -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=NlhGdYPIX/PxhOoz2w4OUUHbodPRM7r3XhyVRRBaicHocqilEv4EfC4evEa/94TRIY jmsEIfcyN2VnPe3VkCNJyGAwXrxV68E59RpZOCvJ8teUShuSeYKYkNu1EVmdRHZvhyAP ar22xy2iQhi8bmwwLrlEJ13LMo3Ry2FjtDh679hqwIHE0urNHvFvXqhGMlrblYr31lTI 6xslZ0nJb/HgY1nCfeKJqFPRMPsSz/AQkceZvUrj5MI0rRjbo0FOtdq2UdaQ8LEf97uz rBfrLSsWpgx5V+n8Gc+8pQznrEbj/oLU5zzIPiIfrIgCXwCBco1bPln4reC1yVJqNz23 Ygeg== X-Gm-Message-State: ALoCoQmqCtGYQ2r+1QUQmLVSlvwMm1L1hq1PokeQH+/cfM6kPua6RJUc21VCczDtqrHIQCxpjZ7n X-Received: by 10.140.217.70 with SMTP id n67mr5880402qhb.96.1445362438830; Tue, 20 Oct 2015 10:33:58 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:6079::d5a]) by smtp.googlemail.com with ESMTPSA id m26sm1640925qki.28.2015.10.20.10.33.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 10:33: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, Al Viro Subject: [PATCH v6 01/19] nfsd: move include of state.h from trace.c to trace.h Date: Tue, 20 Oct 2015 13:33:34 -0400 Message-Id: <1445362432-18869-2-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1445362432-18869-1-git-send-email-jeff.layton@primarydata.com> References: <1445362432-18869-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, 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),