From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752911AbeEUEkj (ORCPT ); Mon, 21 May 2018 00:40:39 -0400 Received: from mx2.suse.de ([195.135.220.15]:55904 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752874AbeEUEkf (ORCPT ); Mon, 21 May 2018 00:40:35 -0400 From: NeilBrown To: Oleg Drokin , Greg Kroah-Hartman , James Simmons , Andreas Dilger Date: Mon, 21 May 2018 14:35:13 +1000 Subject: [PATCH 26/30] staging: lustre: remove libcfs_all from ptlrpc Cc: Linux Kernel Mailing List , Lustre Development List Message-ID: <152687731336.24196.7585327613618183220.stgit@noble> In-Reply-To: <152687724799.24196.7718555295926047576.stgit@noble> References: <152687724799.24196.7718555295926047576.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some files didn't need it at all, others just needed one or two includes. Signed-off-by: NeilBrown --- drivers/staging/lustre/lustre/ptlrpc/errno.c | 1 - drivers/staging/lustre/lustre/ptlrpc/events.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 2 -- drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 2 -- drivers/staging/lustre/lustre/ptlrpc/nrs.c | 3 ++- drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 3 ++- .../staging/lustre/lustre/ptlrpc/pack_generic.c | 2 -- drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 6 ++++-- drivers/staging/lustre/lustre/ptlrpc/recover.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 2 +- 14 files changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/staging/lustre/lustre/ptlrpc/errno.c b/drivers/staging/lustre/lustre/ptlrpc/errno.c index 9985e0bf4b87..c587fc86fcda 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/errno.c +++ b/drivers/staging/lustre/lustre/ptlrpc/errno.c @@ -26,7 +26,6 @@ * Copyright (c) 2013, Intel Corporation. */ -#include #include /* diff --git a/drivers/staging/lustre/lustre/ptlrpc/events.c b/drivers/staging/lustre/lustre/ptlrpc/events.c index d9d8d96f6605..130bacc2c891 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/events.c +++ b/drivers/staging/lustre/lustre/ptlrpc/events.c @@ -33,7 +33,7 @@ #define DEBUG_SUBSYSTEM S_RPC -#include +#include # ifdef __mips64__ # include # endif diff --git a/drivers/staging/lustre/lustre/ptlrpc/llog_client.c b/drivers/staging/lustre/lustre/ptlrpc/llog_client.c index 3d8a2e5d2a92..946d538121de 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/llog_client.c +++ b/drivers/staging/lustre/lustre/ptlrpc/llog_client.c @@ -39,8 +39,6 @@ #define DEBUG_SUBSYSTEM S_LOG -#include - #include #include #include diff --git a/drivers/staging/lustre/lustre/ptlrpc/llog_net.c b/drivers/staging/lustre/lustre/ptlrpc/llog_net.c index 3c6f2f171e41..b871d9e40a9e 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/llog_net.c +++ b/drivers/staging/lustre/lustre/ptlrpc/llog_net.c @@ -43,8 +43,6 @@ #define DEBUG_SUBSYSTEM S_LOG -#include - #include #include #include diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs.c b/drivers/staging/lustre/lustre/ptlrpc/nrs.c index 74a5fcf644e5..e09b86529c5d 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/nrs.c +++ b/drivers/staging/lustre/lustre/ptlrpc/nrs.c @@ -37,11 +37,12 @@ */ #define DEBUG_SUBSYSTEM S_RPC +#include +#include #include #include #include #include -#include #include "ptlrpc_internal.h" /** diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c b/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c index 4876d07aed7d..ff630d94dd26 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c +++ b/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c @@ -44,9 +44,10 @@ */ #define DEBUG_SUBSYSTEM S_RPC +#include +#include #include #include -#include #include "ptlrpc_internal.h" /** diff --git a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c index adf3b8c986e9..6ac9bb570663 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c +++ b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c @@ -41,8 +41,6 @@ #define DEBUG_SUBSYSTEM S_RPC -#include - #include #include diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c b/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c index bff14fb778d2..531005411edf 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c +++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c @@ -52,8 +52,10 @@ #define DEBUG_SUBSYSTEM S_RPC -#include - +#include +#include +#include +#include #include #include #include diff --git a/drivers/staging/lustre/lustre/ptlrpc/recover.c b/drivers/staging/lustre/lustre/ptlrpc/recover.c index 004db1557a1a..2ea0a7ff87dd 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/recover.c +++ b/drivers/staging/lustre/lustre/ptlrpc/recover.c @@ -36,7 +36,7 @@ */ #define DEBUG_SUBSYSTEM S_RPC -#include +#include #include #include diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec.c b/drivers/staging/lustre/lustre/ptlrpc/sec.c index 4af08b2492da..256421465bcd 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec.c @@ -37,7 +37,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#include +#include #include #include #include diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c index 1f35126124fc..625b9520d78f 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c @@ -37,7 +37,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#include +#include #include #include diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c index 4a37f6e1ac30..2389f9a8f534 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c @@ -33,7 +33,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#include +#include #include #include diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c b/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c index fa247d351625..2c8bad7b7877 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c @@ -37,7 +37,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#include +#include #include #include diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c b/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c index c1c862ac0b53..fd609b63d2de 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c @@ -35,7 +35,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#include +#include #include #include