From patchwork Wed Aug 5 21:13: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: 6953161 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 3582B9F402 for ; Wed, 5 Aug 2015 21:14:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6DAFB205DF for ; Wed, 5 Aug 2015 21:14:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98FC3204FF for ; Wed, 5 Aug 2015 21:14:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752472AbbHEVN6 (ORCPT ); Wed, 5 Aug 2015 17:13:58 -0400 Received: from mail-yk0-f170.google.com ([209.85.160.170]:33922 "EHLO mail-yk0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752634AbbHEVNw (ORCPT ); Wed, 5 Aug 2015 17:13:52 -0400 Received: by ykax123 with SMTP id x123so46812605yka.1 for ; Wed, 05 Aug 2015 14:13:52 -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=uiUJSod2a2EKk31/tf47/AgRLOm/WNJrUm2nT8bFZFU=; b=jkOOmDyl7WGNjv1kjQnx7II9dj4fZcVQ/iGu7gdWMdp3lLJPvkFU7RUT90oTlZcTZR P7jTWv9rpyEahXhUS1cC8Oa1yNt0TjLr2IpP4OFwwYZSvXVrN0Fd9EUcUtTMBfyn0dJL PK6ME41Pk8ELvE4NiJ1bM01U16aSYrG8h+SIlQ54uQLT617o1Edfc2ar/05JfR44csWw zZlLV1RK2heFDmUs1sa8cwd1E89XvX0HDEZpv/tofFccIxNfwyI0rxiMhv8kMxM4JSHX EJY7h35PaTMKnhE1k1M4FxSyavAvpy//Fu/7sKs3DSkoqzEvyMFcp8z+vXaCUdDtKC1b B/vw== X-Gm-Message-State: ALoCoQm9k1xNwH7ZiGVUOtL/DKUHJet8iern/48zYFZQiYt4b/mwq3FtHwGmdkIp3xbldU+8zrrv X-Received: by 10.170.112.208 with SMTP id e199mr11612726ykb.69.1438809232015; Wed, 05 Aug 2015 14:13:52 -0700 (PDT) Received: from tlielax.poochiereds.net (cpe-45-37-211-243.nc.res.rr.com. [45.37.211.243]) by smtp.googlemail.com with ESMTPSA id p81sm3975306ywe.19.2015.08.05.14.13.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Aug 2015 14:13:51 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 12/18] nfsd: move include of state.h from trace.c to trace.h Date: Wed, 5 Aug 2015 17:13:30 -0400 Message-Id: <1438809216-4846-13-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1438809216-4846-1-git-send-email-jeff.layton@primarydata.com> References: <1438264341-18048-1-git-send-email-jeff.layton@primarydata.com> <1438809216-4846-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=-7.0 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),