From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jsimmons@infradead.org>
X-Google-Smtp-Source: AIpwx499xZA9wBVm01lqLNwEKpj235GyaAsMharuwQyn5akZwGJeS/xqt8u1ORL3YBHQzwF1+oAD
ARC-Seal: i=1; a=rsa-sha256; t=1523849752; cv=none;
        d=google.com; s=arc-20160816;
        b=a5rwn1I0wwnF9Sc8l8YVduFW396XaJuYFxsAsCjDX2cYtc6T+8MAjrExLaHBel1j9i
         cKtKF+E7rZPHLk1Cahdx8H9zcvSOTOd64NDBfie/2WdxoE0p45jR0bqOgx/Esoofn/EZ
         +Off7x1Qu50+A8UGeHGuvIzUHA+8N/tvEfLvtDCFOgwNFCEu5SlArt5uMqAOf7PTREUv
         00FDxw/zDP0KAwTbQ1a+hx6u9y8KVnnMcvzHk6wtci9Vs0ETEaAfcazE6e1dxJZOJXfr
         r8LwYTB6lM1ItXIXG3EBiYA/Ts/vCtejb3bLPGX5/1s6O9tRMqktcNERZltCWN9HfmV9
         4CDQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=mime-version:user-agent:references:message-id:in-reply-to:subject
         :cc:to:from:date:dkim-signature:arc-authentication-results;
        bh=biPMY7ARFWvaeojhA43tshK1kDJtUrVoyMRO06OYpog=;
        b=fGTFaAg3/hFWVh28uAZCPImFCfjjXWPTuSDxPfQ9tvsXXnu+BA3UlXkEmqRVsfLhxR
         nFXRQ+3Qe2ZEE/ixoX2TmeCbH2QAwQAeFsheKceO86gQsJeVHEvsPHq8Wc1Rh7eKB3ZA
         QpUQqk/pCHKOIGU4Rpp+NGSPKlNJR9YDAFtrR4oFWdq6iRZBPsas7ARxR9KznQfMJYSb
         YfOPGfrbPY8ucosE3IpzUN6uzKBtSpyY7ISiZYSP3fW3jgyGfvdjSn+V6Pf9rEHysbey
         3Eu+Jz2yMMZUntxOjuAjRV9tNeF2VDovdumu7Jujuh7DABda5I4xt87Dx7oQCwWuVIN8
         2Xzg==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=K89Th4fS;
       spf=pass (google.com: best guess record for domain of jsimmons@infradead.org designates 2001:8b0:10b:1236::1 as permitted sender) smtp.mailfrom=jsimmons@infradead.org
Authentication-Results: mx.google.com;
       dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=K89Th4fS;
       spf=pass (google.com: best guess record for domain of jsimmons@infradead.org designates 2001:8b0:10b:1236::1 as permitted sender) smtp.mailfrom=jsimmons@infradead.org
Date: Mon, 16 Apr 2018 04:35:38 +0100 (BST)
From: James Simmons <jsimmons@infradead.org>
To: NeilBrown <neilb@suse.com>
cc: Oleg Drokin <oleg.drokin@intel.com>,
    Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
    Andreas Dilger <andreas.dilger@intel.com>,
    Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
    Lustre Development List <lustre-devel@lists.lustre.org>
Subject: Re: [PATCH 2/6] staging: lustre: remove libcfs/linux/libcfs.h
In-Reply-To: <152383935734.23409.11654775387996961581.stgit@noble>
Message-ID: <alpine.LFD.2.21.1804160431550.16188@casper.infradead.org>
References: <152383910760.23409.2327082725637657049.stgit@noble> <152383935734.23409.11654775387996961581.stgit@noble>
User-Agent: Alpine 2.21 (LFD 202 2017-01-01)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
X-CRM114-CacheID: sfid-20180416_043538_388586_19DD8FC0 
X-CRM114-Status: GOOD (  27.36  )
X-Spam-Score: -0.0 (/)
X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary:
 Content analysis details:   (-0.0 points, 5.0 required)
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 NO_RELAYS              Informational: message was not relayed via SMTP
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: =?utf-8?q?1597861416639795430?=
X-GMAIL-MSGID: =?utf-8?q?1597872277657826419?=
X-Mailing-List: linux-kernel@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>


> This include file is only included in one place,
> and only contains a list of other include directives.
> So just move all those to the place where this file
> is included, and discard the file.
> 
> One include directive uses a local name ("linux-cpu.h"), so
> that needs to be given a proper path.
> 
> Probably many of these should be remove from here, and moved to
> just the files that need them.

Nak. Dumping all the extra headers from linux/libcfs.h to libcfs.h is
the wrong approach. The one header, libcfs.h, to be the only header
in all lustre files is the wrong approach. I have been looking to
unroll that mess. I have patch that I need to polish you that I can
submit.
 
> Signed-off-by: NeilBrown <neilb@suse.com>
> ---
>  .../staging/lustre/include/linux/libcfs/libcfs.h   |   43 ++++++++++
>  .../lustre/include/linux/libcfs/linux/libcfs.h     |   83 --------------------
>  2 files changed, 42 insertions(+), 84 deletions(-)
>  delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
> 
> diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
> index 62e46aa3c554..e59d107d6482 100644
> --- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
> +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
> @@ -38,7 +38,48 @@
>  #include <linux/list.h>
>  
>  #include <uapi/linux/lnet/libcfs_ioctl.h>
> -#include <linux/libcfs/linux/libcfs.h>
> +#include <linux/bitops.h>
> +#include <linux/compiler.h>
> +#include <linux/ctype.h>
> +#include <linux/errno.h>
> +#include <linux/file.h>
> +#include <linux/fs.h>
> +#include <linux/highmem.h>
> +#include <linux/interrupt.h>
> +#include <linux/kallsyms.h>
> +#include <linux/kernel.h>
> +#include <linux/kmod.h>
> +#include <linux/kthread.h>
> +#include <linux/mm.h>
> +#include <linux/mm_inline.h>
> +#include <linux/module.h>
> +#include <linux/moduleparam.h>
> +#include <linux/mutex.h>
> +#include <linux/notifier.h>
> +#include <linux/pagemap.h>
> +#include <linux/random.h>
> +#include <linux/rbtree.h>
> +#include <linux/rwsem.h>
> +#include <linux/scatterlist.h>
> +#include <linux/sched.h>
> +#include <linux/signal.h>
> +#include <linux/slab.h>
> +#include <linux/smp.h>
> +#include <linux/stat.h>
> +#include <linux/string.h>
> +#include <linux/time.h>
> +#include <linux/timer.h>
> +#include <linux/types.h>
> +#include <linux/unistd.h>
> +#include <linux/vmalloc.h>
> +#include <net/sock.h>
> +#include <linux/atomic.h>
> +#include <asm/div64.h>
> +#include <linux/timex.h>
> +#include <linux/uaccess.h>
> +#include <stdarg.h>
> +#include <linux/libcfs/linux/linux-cpu.h>
> +
>  #include <linux/libcfs/libcfs_debug.h>
>  #include <linux/libcfs/libcfs_private.h>
>  #include <linux/libcfs/libcfs_cpu.h>
> diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
> deleted file mode 100644
> index 83aec9c7698f..000000000000
> --- a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
> +++ /dev/null
> @@ -1,83 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * GPL HEADER START
> - *
> - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 only,
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful, but
> - * WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * General Public License version 2 for more details (a copy is included
> - * in the LICENSE file that accompanied this code).
> - *
> - * You should have received a copy of the GNU General Public License
> - * version 2 along with this program; If not, see
> - * http://www.gnu.org/licenses/gpl-2.0.html
> - *
> - * GPL HEADER END
> - */
> -/*
> - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
> - * Use is subject to license terms.
> - *
> - * Copyright (c) 2012, Intel Corporation.
> - */
> -/*
> - * This file is part of Lustre, http://www.lustre.org/
> - * Lustre is a trademark of Sun Microsystems, Inc.
> - */
> -
> -#ifndef __LIBCFS_LINUX_LIBCFS_H__
> -#define __LIBCFS_LINUX_LIBCFS_H__
> -
> -#ifndef __LIBCFS_LIBCFS_H__
> -#error Do not #include this file directly. #include <linux/libcfs/libcfs.h> instead
> -#endif
> -
> -#include <linux/bitops.h>
> -#include <linux/compiler.h>
> -#include <linux/ctype.h>
> -#include <linux/errno.h>
> -#include <linux/file.h>
> -#include <linux/fs.h>
> -#include <linux/highmem.h>
> -#include <linux/interrupt.h>
> -#include <linux/kallsyms.h>
> -#include <linux/kernel.h>
> -#include <linux/kmod.h>
> -#include <linux/kthread.h>
> -#include <linux/mm.h>
> -#include <linux/mm_inline.h>
> -#include <linux/module.h>
> -#include <linux/moduleparam.h>
> -#include <linux/mutex.h>
> -#include <linux/notifier.h>
> -#include <linux/pagemap.h>
> -#include <linux/random.h>
> -#include <linux/rbtree.h>
> -#include <linux/rwsem.h>
> -#include <linux/scatterlist.h>
> -#include <linux/sched.h>
> -#include <linux/signal.h>
> -#include <linux/slab.h>
> -#include <linux/smp.h>
> -#include <linux/stat.h>
> -#include <linux/string.h>
> -#include <linux/time.h>
> -#include <linux/timer.h>
> -#include <linux/types.h>
> -#include <linux/unistd.h>
> -#include <linux/vmalloc.h>
> -#include <net/sock.h>
> -#include <linux/atomic.h>
> -#include <asm/div64.h>
> -#include <linux/timex.h>
> -#include <linux/uaccess.h>
> -#include <stdarg.h>
> -#include "linux-cpu.h"
> -
> -#endif /* _LINUX_LIBCFS_H */
> 
> 
>