LU-9859 libcfs: delete libcfs/linux/libcfs.h

Lustre uses libcfs.h as a the header to include all headers. This
approach has drawbacks like colliding with MOFED compat headers
that do the same thing. This patch is the first step to unwind
including libcfs.h everywhere. This starts with eliminating
linux/libcfs.h.

Test-Parameters: trivial

Change-Id: Id2040d4295c16135561c8251e160cb2117ee21b8
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/30706
Reviewed-by: Doug Oucharek <dougso@me.com>
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>

diff --git a/libcfs/include/libcfs/bitmap.h b/libcfs/include/libcfs/bitmap.h
index 2847260..1763da2 100644 (file)
--- a/libcfs/include/libcfs/bitmap.h
+++ b/libcfs/include/libcfs/bitmap.h
@@ -32,6 +32,9 @@
 #ifndef _LIBCFS_BITMAP_H_
 #define _LIBCFS_BITMAP_H_
 
 #ifndef _LIBCFS_BITMAP_H_
 #define _LIBCFS_BITMAP_H_
 

+#include <linux/interrupt.h>
+#include <libcfs/libcfs_private.h>
+

 struct cfs_bitmap {
        unsigned int size;
        unsigned long data[0];
 struct cfs_bitmap {
        unsigned int size;
        unsigned long data[0];

diff --git a/libcfs/include/libcfs/curproc.h b/libcfs/include/libcfs/curproc.h
index e9e0cc2..0f00c72 100644 (file)
--- a/libcfs/include/libcfs/curproc.h
+++ b/libcfs/include/libcfs/curproc.h
@@ -39,6 +39,10 @@
 #ifndef __LIBCFS_CURPROC_H__
 #define __LIBCFS_CURPROC_H__
 
 #ifndef __LIBCFS_CURPROC_H__
 #define __LIBCFS_CURPROC_H__
 

+/* check if task is running in compat mode.*/
+#define current_pid()          (current->pid)
+#define current_comm()         (current->comm)
+

 typedef __u32 cfs_cap_t;
 
 #define CFS_CAP_CHOWN                   0
 typedef __u32 cfs_cap_t;
 
 #define CFS_CAP_CHOWN                   0

diff --git a/libcfs/include/libcfs/libcfs.h b/libcfs/include/libcfs/libcfs.h
index 38e4cc6..73842eb 100644 (file)
--- a/libcfs/include/libcfs/libcfs.h
+++ b/libcfs/include/libcfs/libcfs.h
@@ -34,7 +34,6 @@
 #define __LIBCFS_LIBCFS_H__
 
 #include <uapi/linux/lnet/libcfs_ioctl.h>
 #define __LIBCFS_LIBCFS_H__
 
 #include <uapi/linux/lnet/libcfs_ioctl.h>

-#include <libcfs/linux/libcfs.h>

 #include <libcfs/libcfs_debug.h>
 #include <libcfs/libcfs_private.h>
 #include <libcfs/bitmap.h>
 #include <libcfs/libcfs_debug.h>
 #include <libcfs/libcfs_private.h>
 #include <libcfs/bitmap.h>


@@ -88,12 +87,6 @@ void lc_watchdog_delete(struct lc_watchdog *lcw);
 #define LNET_ACCEPTOR_MAX_RESERVED_PORT    1023
 
 /*
 #define LNET_ACCEPTOR_MAX_RESERVED_PORT    1023
 
 /*

- * Drop into debugger, if possible. Implementation is provided by platform.
- */
-
-void cfs_enter_debugger(void);
-
-/*

  * Defined by platform
  */
 int unshare_fs_struct(void);
  * Defined by platform
  */
 int unshare_fs_struct(void);


@@ -125,7 +118,7 @@ static inline void *__container_of(const void *ptr, unsigned long shift)
                return (char *)ptr - shift;
 }
 
                return (char *)ptr - shift;
 }
 

-#define container_of0(ptr, type, member)                               \
+#define container_of0(ptr, type, member) \

        ((type *)__container_of((ptr), offsetof(type, member)))
 
 struct lnet_debugfs_symlink_def {
        ((type *)__container_of((ptr), offsetof(type, member)))
 
 struct lnet_debugfs_symlink_def {


@@ -136,4 +129,10 @@ struct lnet_debugfs_symlink_def {
 void lnet_insert_debugfs(struct ctl_table *table,
                         const struct lnet_debugfs_symlink_def *symlinks);
 
 void lnet_insert_debugfs(struct ctl_table *table,
                         const struct lnet_debugfs_symlink_def *symlinks);
 

+/* helper for sysctl handlers */
+int lprocfs_call_handler(void *data, int write, loff_t *ppos,
+                        void __user *buffer, size_t *lenp,
+                        int (*handler)(void *data, int write, loff_t pos,
+                                       void __user *buffer, int len));
+

 #endif /* _LIBCFS_LIBCFS_H_ */
 #endif /* _LIBCFS_LIBCFS_H_ */

diff --git a/libcfs/include/libcfs/libcfs_cpu.h b/libcfs/include/libcfs/libcfs_cpu.h
index 4b17924..ee71f3f 100644 (file)
--- a/libcfs/include/libcfs/libcfs_cpu.h
+++ b/libcfs/include/libcfs/libcfs_cpu.h
@@ -76,6 +76,9 @@
 #ifndef __LIBCFS_CPU_H__
 #define __LIBCFS_CPU_H__
 
 #ifndef __LIBCFS_CPU_H__
 #define __LIBCFS_CPU_H__
 

+#include <linux/slab.h>
+#include <libcfs/linux/linux-cpu.h>
+

 #ifndef HAVE_LIBCFS_CPT
 
 struct cfs_cpt_table {
 #ifndef HAVE_LIBCFS_CPT
 
 struct cfs_cpt_table {

diff --git a/libcfs/include/libcfs/libcfs_debug.h b/libcfs/include/libcfs/libcfs_debug.h
index 67d76cd..e847b90 100644 (file)
--- a/libcfs/include/libcfs/libcfs_debug.h
+++ b/libcfs/include/libcfs/libcfs_debug.h
@@ -38,6 +38,8 @@
 #ifndef __LIBCFS_DEBUG_H__
 #define __LIBCFS_DEBUG_H__
 
 #ifndef __LIBCFS_DEBUG_H__
 #define __LIBCFS_DEBUG_H__
 

+#include <stdarg.h>
+#include <linux/limits.h>

 #include <uapi/linux/lnet/libcfs_debug.h>
 
 /*
 #include <uapi/linux/lnet/libcfs_debug.h>
 
 /*


@@ -105,6 +107,37 @@ do {                                                        \
 
 #ifdef CDEBUG_ENABLED
 
 
 #ifdef CDEBUG_ENABLED
 

+#if !defined(__x86_64__)
+# ifdef __ia64__
+#  define CDEBUG_STACK() (THREAD_SIZE -                                        \
+                         ((unsigned long)__builtin_dwarf_cfa() &       \
+                          (THREAD_SIZE - 1)))
+# else
+#  define CDEBUG_STACK() (THREAD_SIZE -                                        \
+                         ((unsigned long)__builtin_frame_address(0) &  \
+                          (THREAD_SIZE - 1)))
+# endif /* __ia64__ */
+
+#define __CHECK_STACK(msgdata, mask, cdls)                             \
+do {                                                                   \
+       if (unlikely(CDEBUG_STACK() > libcfs_stack)) {                  \
+               LIBCFS_DEBUG_MSG_DATA_INIT(msgdata, D_WARNING, NULL);   \
+               libcfs_stack = CDEBUG_STACK();                          \
+               libcfs_debug_msg(msgdata,                               \
+                                "maximum lustre stack %lu\n",          \
+                                CDEBUG_STACK());                       \
+               (msgdata)->msg_mask = mask;                             \
+               (msgdata)->msg_cdls = cdls;                             \
+               dump_stack();                                           \
+               /*panic("LBUG");*/                                      \
+       }                                                               \
+} while (0)
+#define CFS_CHECK_STACK(msgdata, mask, cdls)  __CHECK_STACK(msgdata, mask, cdls)
+#else /* __x86_64__ */
+#define CFS_CHECK_STACK(msgdata, mask, cdls) do {} while (0)
+#define CDEBUG_STACK() (0L)
+#endif /* __x86_64__ */
+

 /**
  * Filters out logging messages based on mask and subsystem.
  */
 /**
  * Filters out logging messages based on mask and subsystem.
  */

diff --git a/libcfs/include/libcfs/libcfs_prim.h b/libcfs/include/libcfs/libcfs_prim.h
index c592398..6ad1ecb 100644 (file)
--- a/libcfs/include/libcfs/libcfs_prim.h
+++ b/libcfs/include/libcfs/libcfs_prim.h
@@ -36,6 +36,7 @@
 #ifndef __LIBCFS_PRIM_H__
 #define __LIBCFS_PRIM_H__
 
 #ifndef __LIBCFS_PRIM_H__
 #define __LIBCFS_PRIM_H__
 

+#include <linux/mm.h>

 #include <linux/sched.h>
 
 /*
 #include <linux/sched.h>
 
 /*

diff --git a/libcfs/include/libcfs/libcfs_private.h b/libcfs/include/libcfs/libcfs_private.h
index bcd7d56..4931e70 100644 (file)
--- a/libcfs/include/libcfs/libcfs_private.h
+++ b/libcfs/include/libcfs/libcfs_private.h
@@ -42,6 +42,9 @@
 # define DEBUG_SUBSYSTEM S_UNDEFINED
 #endif
 
 # define DEBUG_SUBSYSTEM S_UNDEFINED
 #endif
 

+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+

 #ifdef LIBCFS_DEBUG
 
 /*
 #ifdef LIBCFS_DEBUG
 
 /*

diff --git a/libcfs/include/libcfs/libcfs_time.h b/libcfs/include/libcfs/libcfs_time.h
index 6cbaf9c..e9ce49f 100644 (file)
--- a/libcfs/include/libcfs/libcfs_time.h
+++ b/libcfs/include/libcfs/libcfs_time.h
@@ -36,6 +36,8 @@
 #ifndef __LIBCFS_TIME_H__
 #define __LIBCFS_TIME_H__
 
 #ifndef __LIBCFS_TIME_H__
 #define __LIBCFS_TIME_H__
 

+#include <libcfs/linux/linux-time.h>
+

 /*
  * generic time manipulation functions.
  */
 /*
  * generic time manipulation functions.
  */

diff --git a/libcfs/include/libcfs/linux/Makefile.am b/libcfs/include/libcfs/linux/Makefile.am
index 67a647c..97930b4 100644 (file)
--- a/libcfs/include/libcfs/linux/Makefile.am
+++ b/libcfs/include/libcfs/linux/Makefile.am
@@ -1,2 +1,2 @@
-EXTRA_DIST = libcfs.h linux-misc.h linux-fs.h linux-mem.h linux-time.h linux-cpu.h \
+EXTRA_DIST = linux-misc.h linux-fs.h linux-mem.h linux-time.h linux-cpu.h \

             linux-list.h linux-crypto.h
             linux-list.h linux-crypto.h

diff --git a/libcfs/include/libcfs/linux/libcfs.h b/libcfs/include/libcfs/linux/libcfs.h
deleted file mode 100644 (file)
index 70f307a..0000000
--- a/libcfs/include/libcfs/linux/libcfs.h
+++ /dev/null
@@ -1,150 +0,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, 2017, 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 <libcfs/libcfs.h> instead
-#endif
-
-#ifndef __KERNEL__
-#error This include is only for kernel use.
-#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/module.h>
-#include <linux/moduleparam.h>
-#include <linux/mutex.h>
-#include <linux/notifier.h>
-#include <linux/random.h>
-#include <linux/rbtree.h>
-#include <linux/rwsem.h>
-#include <linux/scatterlist.h>
-#include <linux/sched.h>
-#ifdef HAVE_SCHED_HEADERS
-#include <linux/sched/signal.h>
-#include <linux/sched/mm.h>
-#endif
-#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 <libcfs/linux/linux-cpu.h>
-#include <libcfs/linux/linux-time.h>
-#include <libcfs/linux/linux-mem.h>
-#include <libcfs/linux/linux-misc.h>
-#include <libcfs/linux/linux-fs.h>
-
-#if !defined(__x86_64__)
-# ifdef  __ia64__
-#  define CDEBUG_STACK() (THREAD_SIZE -                                 \
-                          ((unsigned long)__builtin_dwarf_cfa() &       \
-                           (THREAD_SIZE - 1)))
-# else
-#  define CDEBUG_STACK() (THREAD_SIZE -                                 \
-                          ((unsigned long)__builtin_frame_address(0) &  \
-                           (THREAD_SIZE - 1)))
-# endif /* __ia64__ */
-
-#define __CHECK_STACK(msgdata, mask, cdls)                              \
-do {                                                                    \
-        if (unlikely(CDEBUG_STACK() > libcfs_stack)) {                  \
-                LIBCFS_DEBUG_MSG_DATA_INIT(msgdata, D_WARNING, NULL);   \
-                libcfs_stack = CDEBUG_STACK();                          \
-                libcfs_debug_msg(msgdata,                               \
-                                 "maximum lustre stack %lu\n",          \
-                                 CDEBUG_STACK());                       \
-                (msgdata)->msg_mask = mask;                             \
-                (msgdata)->msg_cdls = cdls;                             \
-                dump_stack();                                           \
-              /*panic("LBUG");*/                                        \
-        }                                                               \
-} while (0)
-#define CFS_CHECK_STACK(msgdata, mask, cdls)  __CHECK_STACK(msgdata, mask, cdls)
-#else /* __x86_64__ */
-#define CFS_CHECK_STACK(msgdata, mask, cdls) do {} while(0)
-#define CDEBUG_STACK() (0L)
-#endif /* __x86_64__ */
-
-/**
- * Platform specific declarations for cfs_curproc API (libcfs/curproc.h)
- *
- * Implementation is in linux-curproc.c
- */
-#define CFS_CURPROC_COMM_MAX (sizeof ((struct task_struct *)0)->comm)
-
-/* helper for sysctl handlers */
-int lprocfs_call_handler(void *data, int write, loff_t *ppos,
-                        void __user *buffer, size_t *lenp,
-                        int (*handler)(void *data, int write,
-                        loff_t pos, void __user *buffer, int len));
-
-#ifndef WITH_WATCHDOG
-#define WITH_WATCHDOG
-#endif
-
-/*
- * Macros to access common characteristics of "current" UNIX process.
- */
-#define current_pid()             (current->pid)
-#define current_comm()            (current->comm)
-
-/* check if task is running in compat mode.*/
-int current_is_32bit(void);
-
-#endif /* _LINUX_LIBCFS_H */

diff --git a/libcfs/include/libcfs/linux/linux-cpu.h b/libcfs/include/libcfs/linux/linux-cpu.h
index 3561837..0903a0b 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-cpu.h
+++ b/libcfs/include/libcfs/linux/linux-cpu.h
@@ -39,14 +39,6 @@
 #ifndef __LIBCFS_LINUX_CPU_H__
 #define __LIBCFS_LINUX_CPU_H__
 
 #ifndef __LIBCFS_LINUX_CPU_H__
 #define __LIBCFS_LINUX_CPU_H__
 

-#ifndef __LIBCFS_LIBCFS_H__
-#error Do not #include this file directly. #include <libcfs/libcfs.h> instead
-#endif
-
-#ifndef __KERNEL__
-#error This include is only for kernel use.
-#endif
-

 #include <linux/cpu.h>
 #include <linux/cpuset.h>
 #include <linux/topology.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
 #include <linux/topology.h>

diff --git a/libcfs/include/libcfs/linux/linux-fs.h b/libcfs/include/libcfs/linux/linux-fs.h
index 327793c..32ef1e0 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-fs.h
+++ b/libcfs/include/libcfs/linux/linux-fs.h
@@ -37,14 +37,6 @@
 #ifndef __LIBCFS_LINUX_CFS_FS_H__
 #define __LIBCFS_LINUX_CFS_FS_H__
 
 #ifndef __LIBCFS_LINUX_CFS_FS_H__
 #define __LIBCFS_LINUX_CFS_FS_H__
 

-#ifndef __LIBCFS_LIBCFS_H__
-#error Do not #include this file directly. #include <libcfs/libcfs.h> instead
-#endif
-
-#ifndef __KERNEL__
-#error This include is only for kernel use.
-#endif
-

 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/mount.h>
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/mount.h>

diff --git a/libcfs/include/libcfs/linux/linux-mem.h b/libcfs/include/libcfs/linux/linux-mem.h
index 086d16b..6aca65b 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-mem.h
+++ b/libcfs/include/libcfs/linux/linux-mem.h
@@ -37,14 +37,6 @@
 #ifndef __LIBCFS_LINUX_CFS_MEM_H__
 #define __LIBCFS_LINUX_CFS_MEM_H__
 
 #ifndef __LIBCFS_LINUX_CFS_MEM_H__
 #define __LIBCFS_LINUX_CFS_MEM_H__
 

-#ifndef __LIBCFS_LIBCFS_H__
-#error Do not #include this file directly. #include <libcfs/libcfs.h> instead
-#endif
-
-#ifndef __KERNEL__
-#error This include is only for kernel use.
-#endif
-

 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>

diff --git a/libcfs/include/libcfs/linux/linux-misc.h b/libcfs/include/libcfs/linux/linux-misc.h
index 81d187e..351eaa7 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-misc.h
+++ b/libcfs/include/libcfs/linux/linux-misc.h
@@ -33,6 +33,9 @@
 #ifndef __LIBCFS_LINUX_MISC_H__
 #define __LIBCFS_LINUX_MISC_H__
 
 #ifndef __LIBCFS_LINUX_MISC_H__
 #define __LIBCFS_LINUX_MISC_H__
 

+#include <linux/mutex.h>
+#include <linux/user_namespace.h>
+

 #ifdef HAVE_SYSCTL_CTLNAME
 #define INIT_CTL_NAME  .ctl_name = CTL_UNNUMBERED,
 #define INIT_STRATEGY  .strategy = &sysctl_intvec,
 #ifdef HAVE_SYSCTL_CTLNAME
 #define INIT_CTL_NAME  .ctl_name = CTL_UNNUMBERED,
 #define INIT_STRATEGY  .strategy = &sysctl_intvec,

diff --git a/libcfs/include/libcfs/linux/linux-time.h b/libcfs/include/libcfs/linux/linux-time.h
index 055b166..115092f 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-time.h
+++ b/libcfs/include/libcfs/linux/linux-time.h
@@ -39,14 +39,6 @@
 #ifndef __LIBCFS_LINUX_LINUX_TIME_H__
 #define __LIBCFS_LINUX_LINUX_TIME_H__
 
 #ifndef __LIBCFS_LINUX_LINUX_TIME_H__
 #define __LIBCFS_LINUX_LINUX_TIME_H__
 

-#ifndef __LIBCFS_LIBCFS_H__
-#error Do not #include this file directly. #include <libcfs/libcfs.h> instead
-#endif
-
-#ifndef __KERNEL__
-#error This include is only for kernel use.
-#endif
-

 /* Portable time API */
 
 /*
 /* Portable time API */
 
 /*


@@ -66,6 +58,7 @@
  *  time_t         cfs_duration_sec (cfs_duration_t);
  */
 
  *  time_t         cfs_duration_sec (cfs_duration_t);
  */
 

+#include <linux/hrtimer.h>

 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/version.h>

diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c
index 36fbaf4..ee96827 100644 (file)
--- a/libcfs/libcfs/debug.c
+++ b/libcfs/libcfs/debug.c
@@ -37,7 +37,9 @@
 
 # define DEBUG_SUBSYSTEM S_LNET
 
 
 # define DEBUG_SUBSYSTEM S_LNET
 

+#include <linux/ctype.h>

 #include <linux/kthread.h>
 #include <linux/kthread.h>

+#include <libcfs/linux/linux-misc.h>

 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 

diff --git a/libcfs/libcfs/libcfs_cpu.c b/libcfs/libcfs/libcfs_cpu.c
index d693d17..e829821 100644 (file)
--- a/libcfs/libcfs/libcfs_cpu.c
+++ b/libcfs/libcfs/libcfs_cpu.c
@@ -35,6 +35,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
 
 #define DEBUG_SUBSYSTEM S_LNET
 

+#include <libcfs/linux/linux-cpu.h>

 #include <libcfs/libcfs.h>
 
 /** Global CPU partition table */
 #include <libcfs/libcfs.h>
 
 /** Global CPU partition table */

diff --git a/libcfs/libcfs/libcfs_ptask.c b/libcfs/libcfs/libcfs_ptask.c
index a2d85d3..472d37b 100644 (file)
--- a/libcfs/libcfs/libcfs_ptask.c
+++ b/libcfs/libcfs/libcfs_ptask.c
@@ -35,6 +35,10 @@
 #include <linux/cpu.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/cpu.h>
 #include <linux/slab.h>
 #include <linux/sched.h>

+#ifdef HAVE_SCHED_HEADERS
+#include <linux/sched/signal.h>
+#include <linux/sched/mm.h>
+#endif

 #include <linux/moduleparam.h>
 #include <linux/mmu_context.h>
 
 #include <linux/moduleparam.h>
 #include <linux/mmu_context.h>
 

diff --git a/libcfs/libcfs/libcfs_string.c b/libcfs/libcfs/libcfs_string.c
index 0dc1bb4..cd93921 100644 (file)
--- a/libcfs/libcfs/libcfs_string.c
+++ b/libcfs/libcfs/libcfs_string.c
@@ -36,7 +36,9 @@
  * Author: Nathan Rutman <nathan.rutman@sun.com>
  */
 
  * Author: Nathan Rutman <nathan.rutman@sun.com>
  */
 

+#include <linux/ctype.h>

 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs.h>

+#include <libcfs/libcfs_string.h>

 
 char *cfs_strrstr(const char *haystack, const char *needle)
 {
 
 char *cfs_strrstr(const char *haystack, const char *needle)
 {

diff --git a/libcfs/libcfs/linux/linux-crypto.c b/libcfs/libcfs/linux/linux-crypto.c
index ab80142..d95a54f 100644 (file)
--- a/libcfs/libcfs/linux/linux-crypto.c
+++ b/libcfs/libcfs/linux/linux-crypto.c
@@ -29,6 +29,7 @@
 
 #include <crypto/hash.h>
 #include <linux/scatterlist.h>
 
 #include <crypto/hash.h>
 #include <linux/scatterlist.h>

+#include <linux/pagemap.h>

 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_crypto.h>
 #include <libcfs/linux/linux-crypto.h>
 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_crypto.h>
 #include <libcfs/linux/linux-crypto.h>

diff --git a/libcfs/libcfs/linux/linux-curproc.c b/libcfs/libcfs/linux/linux-curproc.c
index 2fb9c8b..92c48d9 100644 (file)
--- a/libcfs/libcfs/linux/linux-curproc.c
+++ b/libcfs/libcfs/linux/linux-curproc.c
@@ -37,8 +37,12 @@
  */
 
 #include <linux/sched.h>
  */
 
 #include <linux/sched.h>

+#ifdef HAVE_SCHED_HEADERS
+#include <linux/sched/signal.h>
+#include <linux/sched/mm.h>
+#endif

 #include <linux/fs_struct.h>
 #include <linux/fs_struct.h>

-
+#include <linux/pagemap.h>

 #include <linux/compat.h>
 #include <linux/thread_info.h>
 
 #include <linux/compat.h>
 #include <linux/thread_info.h>
 

diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c
index 3ba87ac..81ddd35 100644 (file)
--- a/libcfs/libcfs/linux/linux-debug.c
+++ b/libcfs/libcfs/linux/linux-debug.c
@@ -215,12 +215,6 @@ void libcfs_debug_dumpstack(struct task_struct *tsk)
 }
 EXPORT_SYMBOL(libcfs_debug_dumpstack);
 
 }
 EXPORT_SYMBOL(libcfs_debug_dumpstack);
 

-struct task_struct *libcfs_current(void)
-{
-        CWARN("current task struct is %p\n", current);
-        return current;
-}
-

 static int panic_notifier(struct notifier_block *self, unsigned long unused1,
                          void *unused2)
 {
 static int panic_notifier(struct notifier_block *self, unsigned long unused1,
                          void *unused2)
 {

diff --git a/libcfs/libcfs/linux/linux-module.c b/libcfs/libcfs/linux/linux-module.c
index 97dd9ed..7300af8 100644 (file)
--- a/libcfs/libcfs/linux/linux-module.c
+++ b/libcfs/libcfs/linux/linux-module.c
@@ -32,7 +32,9 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
 
 #define DEBUG_SUBSYSTEM S_LNET
 

+#include <linux/fs.h>

 #include <linux/miscdevice.h>
 #include <linux/miscdevice.h>

+#include <linux/uaccess.h>

 #include <libcfs/libcfs.h>
 
 static inline size_t libcfs_ioctl_packlen(struct libcfs_ioctl_data *data)
 #include <libcfs/libcfs.h>
 
 static inline size_t libcfs_ioctl_packlen(struct libcfs_ioctl_data *data)

diff --git a/libcfs/libcfs/linux/linux-prim.c b/libcfs/libcfs/linux/linux-prim.c
index 36fe0d2..6c10376 100644 (file)
--- a/libcfs/libcfs/linux/linux-prim.c
+++ b/libcfs/libcfs/linux/linux-prim.c
@@ -35,7 +35,10 @@
 #include <linux/kernel.h>
 #include <linux/fs_struct.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/fs_struct.h>
 #include <linux/sched.h>

-
+#ifdef HAVE_SCHED_HEADERS
+#include <linux/sched/signal.h>
+#include <linux/sched/mm.h>
+#endif

 #include <libcfs/libcfs.h>
 
 #if defined(CONFIG_KGDB)
 #include <libcfs/libcfs.h>
 
 #if defined(CONFIG_KGDB)

diff --git a/libcfs/libcfs/linux/linux-tracefile.c b/libcfs/libcfs/linux/linux-tracefile.c
index 6e08612..54f1121 100644 (file)
--- a/libcfs/libcfs/linux/linux-tracefile.c
+++ b/libcfs/libcfs/linux/linux-tracefile.c
@@ -33,6 +33,7 @@
 #define DEBUG_SUBSYSTEM S_LNET
 #define LUSTRE_TRACEFILE_PRIVATE
 
 #define DEBUG_SUBSYSTEM S_LNET
 #define LUSTRE_TRACEFILE_PRIVATE
 

+#include <linux/slab.h>

 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 

diff --git a/libcfs/libcfs/module.c b/libcfs/libcfs/module.c
index e6e6d0c..9fbf40c 100644 (file)
--- a/libcfs/libcfs/module.c
+++ b/libcfs/libcfs/module.c
@@ -53,6 +53,7 @@
 
 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_crypto.h>
 
 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_crypto.h>

+#include <libcfs/linux/linux-misc.h>

 #include <lnet/lib-lnet.h>
 #include "tracefile.h"
 
 #include <lnet/lib-lnet.h>
 #include "tracefile.h"
 

diff --git a/libcfs/libcfs/tracefile.c b/libcfs/libcfs/tracefile.c
index b0ce520..87317ca 100644 (file)
--- a/libcfs/libcfs/tracefile.c
+++ b/libcfs/libcfs/tracefile.c
@@ -40,7 +40,12 @@
 #define LUSTRE_TRACEFILE_PRIVATE
 #include "tracefile.h"
 
 #define LUSTRE_TRACEFILE_PRIVATE
 #include "tracefile.h"
 

+#include <linux/ctype.h>
+#include <linux/fs.h>

 #include <linux/kthread.h>
 #include <linux/kthread.h>

+#include <linux/pagemap.h>
+#include <linux/uaccess.h>
+#include <libcfs/linux/linux-fs.h>

 #include <libcfs/libcfs.h>
 
 /* XXX move things up to the top, comment */
 #include <libcfs/libcfs.h>
 
 /* XXX move things up to the top, comment */

diff --git a/libcfs/libcfs/watchdog.c b/libcfs/libcfs/watchdog.c
index 0b2c736..4f18e3c 100644 (file)
--- a/libcfs/libcfs/watchdog.c
+++ b/libcfs/libcfs/watchdog.c
@@ -40,6 +40,10 @@
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 

+#ifndef WITH_WATCHDOG
+#define WITH_WATCHDOG
+#endif
+

 struct lc_watchdog {
        spinlock_t              lcw_lock;       /* check or change lcw_list */
        int                     lcw_refcount;   /* must hold lcw_pending_timers_lock */
 struct lc_watchdog {
        spinlock_t              lcw_lock;       /* check or change lcw_list */
        int                     lcw_refcount;   /* must hold lcw_pending_timers_lock */

diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h
index 6c1c3fb..cd875a6 100644 (file)
--- a/lnet/include/lnet/lib-types.h
+++ b/lnet/include/lnet/lib-types.h
@@ -44,6 +44,7 @@
 
 #include <linux/kthread.h>
 #include <linux/uio.h>
 
 #include <linux/kthread.h>
 #include <linux/uio.h>

+#include <linux/semaphore.h>

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

diff --git a/lnet/klnds/gnilnd/gnilnd.h b/lnet/klnds/gnilnd/gnilnd.h
index e56fc9f..3940788 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd.h
+++ b/lnet/klnds/gnilnd/gnilnd.h
@@ -61,7 +61,6 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
 
 #define DEBUG_SUBSYSTEM S_LND
 

-#include <libcfs/libcfs.h>

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

diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c
index 443d7fe..8afce81 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/lnet/klnds/gnilnd/gnilnd_cb.c
@@ -26,6 +26,7 @@
 
 #include <asm/page.h>
 #include <linux/nmi.h>
 
 #include <asm/page.h>
 #include <linux/nmi.h>

+#include <linux/pagemap.h>

 #include "gnilnd.h"
 
 /* this is useful when needed to debug wire corruption. */
 #include "gnilnd.h"
 
 /* this is useful when needed to debug wire corruption. */

diff --git a/lnet/klnds/gnilnd/gnilnd_sysctl.c b/lnet/klnds/gnilnd/gnilnd_sysctl.c
index aae29d5..b8f7dd0 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_sysctl.c
+++ b/lnet/klnds/gnilnd/gnilnd_sysctl.c
@@ -26,6 +26,8 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
 
 #define DEBUG_SUBSYSTEM S_LND
 

+#include <libcfs/linux/linux-misc.h>
+

 #include "gnilnd.h"
 
 #define GNILND_PEERSTATE_STRLEN 16
 #include "gnilnd.h"
 
 #define GNILND_PEERSTATE_STRLEN 16

diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h
index 80faa56..381a153 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/lnet/klnds/o2iblnd/o2iblnd.h
@@ -79,7 +79,7 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
 
 #define DEBUG_SUBSYSTEM S_LND
 

-#include <libcfs/libcfs.h>
+#include <libcfs/libcfs_time.h>

 #include <lnet/lib-lnet.h>
 
 #define IBLND_PEER_HASH_SIZE           101     /* # peer_ni lists */
 #include <lnet/lib-lnet.h>
 
 #define IBLND_PEER_HASH_SIZE           101     /* # peer_ni lists */

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index c5d92a4..51c6552 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -41,6 +41,7 @@
 #include <linux/list.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/list.h>
 #include <linux/mm.h>
 #include <linux/module.h>

+#include <linux/pagemap.h>

 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/syscalls.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/syscalls.h>


@@ -50,7 +51,6 @@
 #include <net/sock.h>
 #include <net/tcp.h>
 
 #include <net/sock.h>
 #include <net/tcp.h>
 

-#include <libcfs/libcfs.h>

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

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index 42fa8aa..0e0865b 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -31,9 +31,12 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
  */
 
 #define DEBUG_SUBSYSTEM S_LNET

+
+#include <linux/ctype.h>

 #include <linux/log2.h>
 #include <linux/ktime.h>
 #include <linux/moduleparam.h>
 #include <linux/log2.h>
 #include <linux/ktime.h>
 #include <linux/moduleparam.h>

+#include <linux/uaccess.h>

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

diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c
index a2a688a..57f63fa 100644 (file)
--- a/lnet/lnet/config.c
+++ b/lnet/lnet/config.c
@@ -31,6 +31,8 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
  */
 
 #define DEBUG_SUBSYSTEM S_LNET

+
+#include <linux/ctype.h>

 #include <linux/nsproxy.h>
 #include <net/net_namespace.h>
 #include <lnet/lib-lnet.h>
 #include <linux/nsproxy.h>
 #include <net/net_namespace.h>
 #include <lnet/lib-lnet.h>

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index b31ab86..a50e2af 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -36,6 +36,8 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
 
 #define DEBUG_SUBSYSTEM S_LNET
 

+#include <linux/pagemap.h>
+

 #include <lnet/lib-lnet.h>
 #include <linux/nsproxy.h>
 #include <net/net_namespace.h>
 #include <lnet/lib-lnet.h>
 #include <linux/nsproxy.h>
 #include <net/net_namespace.h>

diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c
index b7d768f..d4041b0 100644 (file)
--- a/lnet/lnet/peer.c
+++ b/lnet/lnet/peer.c
@@ -34,6 +34,12 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
 
 #define DEBUG_SUBSYSTEM S_LNET
 

+#include <linux/sched.h>
+#ifdef HAVE_SCHED_HEADERS
+#include <linux/sched/signal.h>
+#endif
+#include <linux/uaccess.h>
+

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

diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c
index 1343b31..24d57f5 100644 (file)
--- a/lnet/lnet/router_proc.c
+++ b/lnet/lnet/router_proc.c
@@ -21,6 +21,10 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
  */
 
 #define DEBUG_SUBSYSTEM S_LNET

+
+#include <linux/uaccess.h>
+
+#include <libcfs/linux/linux-misc.h>

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

diff --git a/lnet/selftest/console.c b/lnet/selftest/console.c
index 48b980d..554ce0b 100644 (file)
--- a/lnet/selftest/console.c
+++ b/lnet/selftest/console.c
@@ -36,7 +36,6 @@
  * Author: Liang Zhen <liangzhen@clusterfs.com>
  */
 
  * Author: Liang Zhen <liangzhen@clusterfs.com>
  */
 

-

 #include <libcfs/libcfs.h>
 #include <lnet/lib-lnet.h>
 #include "console.h"
 #include <libcfs/libcfs.h>
 #include <lnet/lib-lnet.h>
 #include "console.h"

diff --git a/lnet/selftest/console.h b/lnet/selftest/console.h
index 641f9be..001d8f3 100644 (file)
--- a/lnet/selftest/console.h
+++ b/lnet/selftest/console.h
@@ -39,6 +39,7 @@
 #ifndef __LST_CONSOLE_H__
 #define __LST_CONSOLE_H__
 
 #ifndef __LST_CONSOLE_H__
 #define __LST_CONSOLE_H__
 

+#include <linux/uaccess.h>

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

diff --git a/lustre/fid/fid_request.c b/lustre/fid/fid_request.c
index 78638c1..2f45caf 100644 (file)
--- a/lustre/fid/fid_request.c
+++ b/lustre/fid/fid_request.c
@@ -39,7 +39,6 @@
 #define DEBUG_SUBSYSTEM S_FID
 
 #include <linux/module.h>
 #define DEBUG_SUBSYSTEM S_FID
 
 #include <linux/module.h>

-#include <libcfs/libcfs.h>

 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>

diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h
index 0ca82d7..7a9b999 100644 (file)
--- a/lustre/include/cl_object.h
+++ b/lustre/include/cl_object.h
@@ -88,6 +88,9 @@
 /*
  * super-class definitions.
  */
 /*
  * super-class definitions.
  */

+#include <linux/aio.h>
+#include <linux/fs.h>
+

 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_ptask.h>
 #include <lu_object.h>
 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_ptask.h>
 #include <lu_object.h>

diff --git a/lustre/include/lprocfs_status.h b/lustre/include/lprocfs_status.h
index 7576a5f..4b244f3 100644 (file)
--- a/lustre/include/lprocfs_status.h
+++ b/lustre/include/lprocfs_status.h
@@ -45,7 +45,8 @@
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>
 
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>
 

-#include <libcfs/libcfs.h>
+#include <libcfs/libcfs_time.h>
+#include <libcfs/linux/linux-misc.h>

 #include <uapi/linux/lustre/lustre_idl.h>
 
 struct lprocfs_vars {
 #include <uapi/linux/lustre/lustre_idl.h>
 
 struct lprocfs_vars {

diff --git a/lustre/include/lustre_compat.h b/lustre/include/lustre_compat.h
index 5a4a591..6a5b6cc 100644 (file)
--- a/lustre/include/lustre_compat.h
+++ b/lustre/include/lustre_compat.h
@@ -33,13 +33,15 @@
 #ifndef _LUSTRE_COMPAT_H
 #define _LUSTRE_COMPAT_H
 
 #ifndef _LUSTRE_COMPAT_H
 #define _LUSTRE_COMPAT_H
 

+#include <linux/aio.h>
+#include <linux/fs.h>

 #include <linux/fs_struct.h>
 #include <linux/namei.h>
 #include <linux/pagemap.h>
 #include <linux/bio.h>
 #include <linux/xattr.h>
 
 #include <linux/fs_struct.h>
 #include <linux/namei.h>
 #include <linux/pagemap.h>
 #include <linux/bio.h>
 #include <linux/xattr.h>
 

-#include <libcfs/libcfs.h>
+#include <libcfs/linux/linux-fs.h>

 #include <lustre_patchless_compat.h>
 #include <obd_support.h>
 
 #include <lustre_patchless_compat.h>
 #include <obd_support.h>
 

diff --git a/lustre/include/lustre_lib.h b/lustre/include/lustre_lib.h
index 05ffbb9..8334d8f 100644 (file)
--- a/lustre/include/lustre_lib.h
+++ b/lustre/include/lustre_lib.h
@@ -42,6 +42,11 @@
  * @{
  */
 
  * @{
  */
 

+#ifdef HAVE_SCHED_HEADERS
+#include <linux/sched/signal.h>
+#include <linux/sched/mm.h>
+#endif
+

 #include <libcfs/libcfs.h>
 #include <uapi/linux/lustre/lustre_idl.h>
 #include <uapi/linux/lustre/lustre_ver.h>
 #include <libcfs/libcfs.h>
 #include <uapi/linux/lustre/lustre_idl.h>
 #include <uapi/linux/lustre/lustre_ver.h>

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index 98e2194..063821f 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -33,11 +33,8 @@
 #ifndef _OBD_SUPPORT
 #define _OBD_SUPPORT
 
 #ifndef _OBD_SUPPORT
 #define _OBD_SUPPORT
 

-#ifndef __KERNEL__
-# error Userspace should not include obd_support.h.
-#endif /* !__KERNEL__ */
-

 #include <linux/atomic.h>
 #include <linux/atomic.h>

+#include <linux/ctype.h>

 #include <linux/highmem.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/highmem.h>
 #include <linux/slab.h>
 #include <linux/types.h>

diff --git a/lustre/ldlm/ldlm_pool.c b/lustre/ldlm/ldlm_pool.c
index bf221ba..282546d 100644 (file)
--- a/lustre/ldlm/ldlm_pool.c
+++ b/lustre/ldlm/ldlm_pool.c
@@ -94,6 +94,7 @@
 #define DEBUG_SUBSYSTEM S_LDLM
 
 #include <linux/kthread.h>
 #define DEBUG_SUBSYSTEM S_LDLM
 
 #include <linux/kthread.h>

+#include <libcfs/linux/linux-mem.h>

 #include <lustre_dlm.h>
 #include <cl_object.h>
 #include <obd_class.h>
 #include <lustre_dlm.h>
 #include <cl_object.h>
 #include <obd_class.h>

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index f6d7edd..5851cd8 100644 (file)
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -38,11 +38,12 @@
 #include <linux/pagemap.h>
 #include <linux/mm.h>
 #include <linux/version.h>
 #include <linux/pagemap.h>
 #include <linux/mm.h>
 #include <linux/version.h>

+#include <linux/security.h>

 #include <linux/user_namespace.h>
 #ifdef HAVE_UIDGID_HEADER
 # include <linux/uidgid.h>
 #endif
 #include <linux/user_namespace.h>
 #ifdef HAVE_UIDGID_HEADER
 # include <linux/uidgid.h>
 #endif

-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 #include <linux/buffer_head.h>   // for wait_on_buffer
 #include <linux/pagevec.h>
 
 #include <linux/buffer_head.h>   // for wait_on_buffer
 #include <linux/pagevec.h>
 

diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index 6eaeb46..7aee5ad 100644 (file)
--- a/lustre/llite/llite_mmap.c
+++ b/lustre/llite/llite_mmap.c
@@ -31,6 +31,7 @@
  */
 
 #include <linux/kernel.h>
  */
 
 #include <linux/kernel.h>

+#include <linux/delay.h>

 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/stat.h>

diff --git a/lustre/llite/range_lock.c b/lustre/llite/range_lock.c
index 9795bb9..7a4c9c4 100644 (file)
--- a/lustre/llite/range_lock.c
+++ b/lustre/llite/range_lock.c
@@ -33,6 +33,9 @@
  * Author: Prakash Surya <surya1@llnl.gov>
  * Author: Bobi Jam <bobijam.xu@intel.com>
  */
  * Author: Prakash Surya <surya1@llnl.gov>
  * Author: Bobi Jam <bobijam.xu@intel.com>
  */

+#ifdef HAVE_SCHED_HEADERS
+#include <linux/sched/signal.h>
+#endif

 #include "range_lock.h"
 #include <uapi/linux/lustre/lustre_user.h>
 
 #include "range_lock.h"
 #include <uapi/linux/lustre/lustre_user.h>
 

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 934b247..5ce50cb 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -31,7 +31,8 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LMV
  */
 
 #define DEBUG_SUBSYSTEM S_LMV

-#include <linux/slab.h>
+
+#include <linux/file.h>

 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/user_namespace.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/user_namespace.h>

diff --git a/lustre/lod/lod_object.c b/lustre/lod/lod_object.c
index 2ca8d21..f5f5211 100644 (file)
--- a/lustre/lod/lod_object.c
+++ b/lustre/lod/lod_object.c
@@ -40,6 +40,8 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
 
 #define DEBUG_SUBSYSTEM S_MDS
 

+#include <linux/random.h>
+

 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>

diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c
index 23d7a5f..a4ade5c 100644 (file)
--- a/lustre/lov/lov_object.c
+++ b/lustre/lov/lov_object.c
@@ -37,6 +37,8 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
 
 #define DEBUG_SUBSYSTEM S_LOV
 

+#include <linux/random.h>
+

 #include "lov_cl_internal.h"
 
 static inline struct lov_device *lov_object_dev(struct lov_object *obj)
 #include "lov_cl_internal.h"
 
 static inline struct lov_device *lov_object_dev(struct lov_object *obj)

diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c
index ed63745..b15e8b4 100644 (file)
--- a/lustre/mdd/mdd_dir.c
+++ b/lustre/mdd/mdd_dir.c
@@ -38,6 +38,8 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
 
 #define DEBUG_SUBSYSTEM S_MDS
 

+#include <linux/kthread.h>
+

 #include <obd_class.h>
 #include <obd_support.h>
 #include <lustre_mds.h>
 #include <obd_class.h>
 #include <obd_support.h>
 #include <lustre_mds.h>

diff --git a/lustre/obdclass/jobid.c b/lustre/obdclass/jobid.c
index 8fc4956..5b772e3 100644 (file)
--- a/lustre/obdclass/jobid.c
+++ b/lustre/obdclass/jobid.c
@@ -37,6 +37,7 @@
 #include <linux/uidgid.h>
 #endif
 
 #include <linux/uidgid.h>
 #endif
 

+#include <libcfs/linux/linux-misc.h>

 #include <obd_support.h>
 #include <obd_class.h>
 #include <lustre_net.h>
 #include <obd_support.h>
 #include <obd_class.h>
 #include <lustre_net.h>

diff --git a/lustre/obdclass/kernelcomm.c b/lustre/obdclass/kernelcomm.c
index 64a312b..85e925e 100644 (file)
--- a/lustre/obdclass/kernelcomm.c
+++ b/lustre/obdclass/kernelcomm.c
@@ -36,6 +36,8 @@
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
 
 #define DEBUG_SUBSYSTEM S_CLASS
 

+#include <linux/file.h>
+

 #include <obd_support.h>
 #include <lustre_kernelcomm.h>
 
 #include <obd_support.h>
 #include <lustre_kernelcomm.h>
 

diff --git a/lustre/obdclass/lu_object.c b/lustre/obdclass/lu_object.c
index 5ea8d9c..543efcc 100644 (file)
--- a/lustre/obdclass/lu_object.c
+++ b/lustre/obdclass/lu_object.c
@@ -44,6 +44,7 @@
 #include <linux/list.h>
 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_hash.h> /* hash_long() */
 #include <linux/list.h>
 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_hash.h> /* hash_long() */

+#include <libcfs/linux/linux-mem.h>

 #include <obd_class.h>
 #include <obd_support.h>
 #include <lustre_disk.h>
 #include <obd_class.h>
 #include <obd_support.h>
 #include <lustre_disk.h>

diff --git a/lustre/osc/osc_internal.h b/lustre/osc/osc_internal.h
index 29f72bd..e9df607 100644 (file)
--- a/lustre/osc/osc_internal.h
+++ b/lustre/osc/osc_internal.h
@@ -35,6 +35,7 @@
 
 #define OAP_MAGIC 8675309
 
 
 #define OAP_MAGIC 8675309
 

+#include <libcfs/linux/linux-mem.h>

 #include <lustre_osc.h>
 
 extern atomic_t osc_pool_req_count;
 #include <lustre_osc.h>
 
 extern atomic_t osc_pool_req_count;

diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c
index ea7648b..c80296a 100644 (file)
--- a/lustre/osc/osc_lock.c
+++ b/lustre/osc/osc_lock.c
@@ -37,7 +37,6 @@
 
 #define DEBUG_SUBSYSTEM S_OSC
 
 
 #define DEBUG_SUBSYSTEM S_OSC
 

-#include <libcfs/libcfs.h>

 /* fid_build_reg_res_name() */
 #include <lustre_fid.h>
 #include <lustre_osc.h>
 /* fid_build_reg_res_name() */
 #include <lustre_fid.h>
 #include <lustre_osc.h>

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 4b33a96..518a30f 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -32,8 +32,6 @@
 
 #define DEBUG_SUBSYSTEM S_OSC
 
 
 #define DEBUG_SUBSYSTEM S_OSC
 

-#include <libcfs/libcfs.h>
-

 #include <lprocfs_status.h>
 #include <lustre_debug.h>
 #include <lustre_dlm.h>
 #include <lprocfs_status.h>
 #include <lustre_debug.h>
 #include <lustre_dlm.h>

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index e4b9af4..8e0ef0c 100644 (file)
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -39,6 +39,7 @@
 
 #define DEBUG_SUBSYSTEM S_OSD
 
 
 #define DEBUG_SUBSYSTEM S_OSD
 

+#include <linux/kallsyms.h>

 #include <linux/module.h>
 #include <linux/user_namespace.h>
 #ifdef HAVE_UIDGID_HEADER
 #include <linux/module.h>
 #include <linux/user_namespace.h>
 #ifdef HAVE_UIDGID_HEADER

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index d73fcaf..95fd6ec 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -34,6 +34,7 @@
 
 #define DEBUG_SUBSYSTEM S_RPC
 
 
 #define DEBUG_SUBSYSTEM S_RPC
 

+#include <linux/delay.h>

 #include <obd_support.h>
 #include <obd_class.h>
 #include <lustre_lib.h>
 #include <obd_support.h>
 #include <obd_class.h>
 #include <lustre_lib.h>

diff --git a/lustre/ptlrpc/gss/gss_crypto.h b/lustre/ptlrpc/gss/gss_crypto.h
index ad15cde..99c2337 100644 (file)
--- a/lustre/ptlrpc/gss/gss_crypto.h
+++ b/lustre/ptlrpc/gss/gss_crypto.h
@@ -1,6 +1,8 @@
 #ifndef PTLRPC_GSS_CRYPTO_H
 #define PTLRPC_GSS_CRYPTO_H
 
 #ifndef PTLRPC_GSS_CRYPTO_H
 #define PTLRPC_GSS_CRYPTO_H
 

+#include <linux/scatterlist.h>
+

 #include "gss_internal.h"
 
 struct gss_keyblock {
 #include "gss_internal.h"
 
 struct gss_keyblock {

diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c
index ffc1994..426a804 100644 (file)
--- a/lustre/ptlrpc/sec_bulk.c
+++ b/lustre/ptlrpc/sec_bulk.c
@@ -36,7 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
 
 #define DEBUG_SUBSYSTEM S_SEC
 

-#include <libcfs/libcfs.h>
+#include <libcfs/linux/linux-mem.h>

 
 #include <obd.h>
 #include <obd_cksum.h>
 
 #include <obd.h>
 #include <obd_cksum.h>