Commit e6eafdb9 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: start moving includes out of libcfs.h 



Lots of places include libcfs.h, and it includes lots of other include
files.  Many of these aren't needed in many places.  It is tidier and
better documentation to just include what is needed.

So remove all the includes from libcfs.h and create libcfs_all.h which
contains them.  Then change every reference to libcfs.h to instead
include libcfs_all.h

Next several patches will remove that from various files
in small batches

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7673fd6b

drivers/staging/lustre/include/linux/libcfs/libcfs.h

+2 −46
Original line number Diff line number Diff line
@@ -34,56 +34,12 @@ 
#ifndef __LIBCFS_LIBCFS_H__

#define __LIBCFS_LIBCFS_H__



#include <linux/gfp.h>

#include <linux/list.h>



#include <uapi/linux/lnet/libcfs_ioctl.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/workqueue.h>

#include <linux/sysctl.h>



#include <linux/libcfs/libcfs_debug.h>

#include <linux/libcfs/libcfs_private.h>

#include <linux/libcfs/libcfs_cpu.h>

#include <linux/libcfs/libcfs_string.h>

#include <linux/libcfs/libcfs_hash.h>

#include <linux/libcfs/libcfs_fail.h>



#define LIBCFS_VERSION "0.7.0"

drivers/staging/lustre/include/linux/libcfs/libcfs_all.h

0 → 100644
+88 −0
Original line number Diff line number Diff line 
// 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) 2011, 2015, Intel Corporation.

 */

/*

 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Sun Microsystems, Inc.

 */



#ifndef __LIBCFS_LIBCFS_ALL_H__

#define __LIBCFS_LIBCFS_ALL_H__



#include <linux/gfp.h>

#include <linux/list.h>



#include <uapi/linux/lnet/libcfs_ioctl.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/libcfs.h>



#include <linux/libcfs/libcfs_cpu.h>

#include <linux/libcfs/libcfs_string.h>

#include <linux/libcfs/libcfs_hash.h>



#endif /* __LIBCFS_LIBCFS_ALL_H__ */

drivers/staging/lustre/include/linux/lnet/lib-lnet.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#ifndef __LNET_LIB_LNET_H__

#define __LNET_LIB_LNET_H__



#include <linux/libcfs/libcfs.h>

#include <linux/libcfs/libcfs_all.h>

#include <linux/lnet/api.h>

#include <linux/lnet/lib-types.h>

#include <uapi/linux/lnet/lnet-dlc.h>

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 


#define DEBUG_SUBSYSTEM S_LND



#include <linux/libcfs/libcfs.h>

#include <linux/libcfs/libcfs_all.h>

#include <linux/lnet/lib-lnet.h>



#define IBLND_PEER_HASH_SIZE		101	/* # peer lists */

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#include <net/sock.h>

#include <net/tcp.h>



#include <linux/libcfs/libcfs.h>

#include <linux/libcfs/libcfs_all.h>

#include <linux/lnet/lib-lnet.h>

#include <linux/lnet/socklnd.h>