From: eeb <eeb>
Date: Fri, 4 Feb 2005 19:25:06 +0000 (+0000)
Subject:  *   updates to HEAD lustre since landing b_port_step on portals
X-Git-Tag: v1_7_100~1639
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=b91058999ccd0e34bcc689acd1afdcad24de5590

 *   updates to HEAD lustre since landing b_port_step on portals
---

diff --git a/lnet/libcfs/linux/linux-debug.c b/lnet/libcfs/linux/linux-debug.c
index 8ac8d55..e8029b5 100644
--- a/lnet/libcfs/linux/linux-debug.c
+++ b/lnet/libcfs/linux/linux-debug.c
@@ -59,7 +59,6 @@
 #include <linux/kallsyms.h>
 #endif
 
-static int handled_panic; /* to avoid recursive calls to notifiers */
 char portals_upcall[1024] = "/usr/lib/lustre/portals_upcall";
 
 void portals_run_upcall(char **argv)
diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index 36d44cc..8f925e6 100644
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -40,9 +40,9 @@
 #include <sys/stat.h>
 #include <sys/vfs.h>
 
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include <portals/p30.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 
 /* definitions for liblustre */
 
@@ -348,16 +348,7 @@ static inline int kmem_cache_destroy(kmem_cache_t *a)
 #define PAGE_CACHE_SHIFT PAGE_SHIFT
 #define PAGE_CACHE_MASK  PAGE_MASK
 
-struct page {
-        void   *addr;
-        unsigned long index;
-        struct list_head list;
-        unsigned long private;
-
-        /* internally used by liblustre file i/o */
-        int     _offset;
-        int     _count;
-};
+/* struct page decl moved out from here into portals/include/libcfs/user-prim.h */
 
 /* 2.4 defines */
 #define PAGE_LIST_ENTRY list
diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h
index 2e2474f..17ad969 100644
--- a/lustre/include/linux/lprocfs_status.h
+++ b/lustre/include/linux/lprocfs_status.h
@@ -31,7 +31,7 @@
 #include <linux/proc_fs.h>
 #include <linux/version.h>
 #include <linux/smp.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 
 # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
 #  include <linux/statfs.h>
diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index db19c01..711f282 100644
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -29,7 +29,7 @@
 #error sorry, lustre requires at least 2.5.69
 #endif
 
-#include <linux/portals_compat25.h>
+#include <libcfs/linux/portals_compat25.h>
 
 /*
  * groups_info related staff
diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index 5f64011..21a7278d 100644
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -62,7 +62,7 @@
 # include <asm/types.h>
 # include <stdint.h>
 #endif
-# include <portals/list.h>
+# include <libcfs/list.h>
 # include <string.h>
 #endif
 
diff --git a/lustre/include/linux/lustre_lib.h b/lustre/include/linux/lustre_lib.h
index c9b3335..8851c35 100644
--- a/lustre/include/linux/lustre_lib.h
+++ b/lustre/include/linux/lustre_lib.h
@@ -35,7 +35,7 @@
 # include <linux/signal.h>
 # include <linux/types.h>
 #endif
-#include <linux/kp30.h> 
+#include <libcfs/kp30.h> 
 #include <linux/lustre_idl.h>
 #include <linux/lustre_cfg.h>
 
@@ -486,7 +486,7 @@ static inline void obd_ioctl_freedata(char *buf, int len)
 #define OBD_IOC_SMFS_SNAP_ADD          _IOWR('f', 230, long)
 
 /* XXX _IOWR('f', 250, long) has been defined in
- * portals/include/linux/kp30.h for debug, don't use it
+ * portals/include/libcfs/kp30.h for debug, don't use it
  */
 
 /* Until such time as we get_info the per-stripe maximum from the OST,
diff --git a/lustre/include/linux/lustre_mds.h b/lustre/include/linux/lustre_mds.h
index 0ed932f..19aaee9 100644
--- a/lustre/include/linux/lustre_mds.h
+++ b/lustre/include/linux/lustre_mds.h
@@ -32,7 +32,7 @@
 #endif
 
 #include <linux/lustre_handles.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_idl.h>
 #include <linux/lustre_lib.h>
 #include <linux/lustre_dlm.h>
diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h
index d0694f9..d938260 100644
--- a/lustre/include/linux/lustre_net.h
+++ b/lustre/include/linux/lustre_net.h
@@ -32,7 +32,7 @@
 #endif
 #endif
 
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 // #include <linux/obd.h>
 #include <portals/p30.h>
 #include <linux/lustre_idl.h>
diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index fcccab4..5e3cbd0 100644
--- a/lustre/include/linux/lvfs.h
+++ b/lustre/include/linux/lvfs.h
@@ -1,7 +1,7 @@
 #ifndef __LVFS_H__
 #define __LVFS_H__
 
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 
 #define LL_ID_NAMELEN (16 + 1 + 8 + 1)
 
diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index 4d07d64..bd7ad68 100644
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -25,7 +25,7 @@
 
 #ifndef __KERNEL__
 #include <sys/types.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 #else
 #include <asm/segment.h>
 #include <asm/uaccess.h>
diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index 57623e8..8783209 100644
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 #include <linux/highmem.h>
 #endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_compat25.h>
 
 /* global variables */
diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c
index 3a8bd24..15f46e2 100644
--- a/lustre/ldlm/ldlm_flock.c
+++ b/lustre/ldlm/ldlm_flock.c
@@ -28,7 +28,7 @@
 #include <linux/obd_support.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_lib.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 #else
 #include <liblustre.h>
 #endif
diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 8a81f04..4b58aea 100644
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -29,7 +29,7 @@
 # include <linux/lustre_dlm.h>
 #else
 # include <liblustre.h>
-# include <linux/kp30.h>
+# include <libcfs/kp30.h>
 #endif
 
 #include <linux/obd_class.h>
diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index fa963ab..5999373 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -37,7 +37,7 @@
 
 #include <linux/lustre_dlm.h>
 #include <linux/obd_class.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include "ldlm_internal.h"
 
 extern kmem_cache_t *ldlm_resource_slab;
diff --git a/lustre/lvfs/fsfilt.c b/lustre/lvfs/fsfilt.c
index a9ddf8b..cc14ab6 100644
--- a/lustre/lvfs/fsfilt.c
+++ b/lustre/lvfs/fsfilt.c
@@ -8,7 +8,7 @@
 #include <linux/module.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_fsfilt.h>
 
 LIST_HEAD(fsfilt_types);
diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index a9fb04f..4994b1e 100644
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -42,7 +42,7 @@
 #include <ext3/xattr.h>
 #endif
 
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/obd.h>
 #include <linux/obd_class.h>
diff --git a/lustre/lvfs/fsfilt_reiserfs.c b/lustre/lvfs/fsfilt_reiserfs.c
index 861b663..b9f987ab 100644
--- a/lustre/lvfs/fsfilt_reiserfs.c
+++ b/lustre/lvfs/fsfilt_reiserfs.c
@@ -41,7 +41,7 @@
 #include <linux/init.h>
 #include <asm/statfs.h>
 #endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/obd.h>
 #include <linux/obd_class.h>
diff --git a/lustre/lvfs/fsfilt_smfs.c b/lustre/lvfs/fsfilt_smfs.c
index acbc93a..486b97a 100644
--- a/lustre/lvfs/fsfilt_smfs.c
+++ b/lustre/lvfs/fsfilt_smfs.c
@@ -31,7 +31,7 @@
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
 #include <linux/version.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/lustre_smfs.h>
 #include <linux/obd.h>
diff --git a/lustre/lvfs/fsfilt_snap_ext3.c b/lustre/lvfs/fsfilt_snap_ext3.c
index 4a8e006..ffe147e 100644
--- a/lustre/lvfs/fsfilt_snap_ext3.c
+++ b/lustre/lvfs/fsfilt_snap_ext3.c
@@ -43,7 +43,7 @@
 #include <ext3/xattr.h>
 #endif
 
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/obd.h>
 #include <linux/obd_class.h>
diff --git a/lustre/lvfs/fsfilt_snap_smfs.c b/lustre/lvfs/fsfilt_snap_smfs.c
index 268db4b..12e33ef 100644
--- a/lustre/lvfs/fsfilt_snap_smfs.c
+++ b/lustre/lvfs/fsfilt_snap_smfs.c
@@ -29,7 +29,7 @@
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
 #include <linux/version.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/lustre_smfs.h>
 #include <linux/obd.h>
diff --git a/lustre/lvfs/llog_cat.c b/lustre/lvfs/llog_cat.c
index b6fbd8e..b7a5c8f 100644
--- a/lustre/lvfs/llog_cat.c
+++ b/lustre/lvfs/llog_cat.c
@@ -39,7 +39,7 @@
 #endif
 
 #include <linux/lustre_log.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 
 /* Create a new log handle and add it to the open list.
  * This log handle will be closed when all of the records in it are removed.
diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
index e8b7d49..4118a53 100644
--- a/lustre/lvfs/lvfs_linux.c
+++ b/lustre/lvfs/lvfs_linux.c
@@ -36,7 +36,7 @@
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
 #include <linux/version.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/obd.h>
 #include <linux/obd_class.h>
diff --git a/lustre/lvfs/lvfs_reint.c b/lustre/lvfs/lvfs_reint.c
index 3f8ddc2..0bf6444 100644
--- a/lustre/lvfs/lvfs_reint.c
+++ b/lustre/lvfs/lvfs_reint.c
@@ -33,7 +33,7 @@
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
 #include <linux/version.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/obd.h>
 #include <linux/obd_class.h>
diff --git a/lustre/lvfs/lvfs_undo.c b/lustre/lvfs/lvfs_undo.c
index 570e207..0018a59 100644
--- a/lustre/lvfs/lvfs_undo.c
+++ b/lustre/lvfs/lvfs_undo.c
@@ -16,7 +16,7 @@
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
 #include <linux/version.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/obd.h>
 #include <linux/obd_class.h>
diff --git a/lustre/mds/mds_fs.c b/lustre/mds/mds_fs.c
index 8242a7a..904b657 100644
--- a/lustre/mds/mds_fs.c
+++ b/lustre/mds/mds_fs.c
@@ -39,7 +39,7 @@
 #include <linux/obd_support.h>
 #include <linux/lustre_lib.h>
 #include <linux/lustre_fsfilt.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 
 #include <linux/lustre_smfs.h>
 #include "mds_internal.h"
diff --git a/lustre/mds/mds_groups.c b/lustre/mds/mds_groups.c
index 33aba61..7da07f7 100644
--- a/lustre/mds/mds_groups.c
+++ b/lustre/mds/mds_groups.c
@@ -41,7 +41,7 @@
 #include <linux/slab.h>
 #include <asm/segment.h>
 
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include <linux/obd_support.h>
 #include <linux/lustre_lib.h>
 #include <linux/lustre_mds.h>
diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c
index 8b95969..734dc16 100644
--- a/lustre/mds/mds_log.c
+++ b/lustre/mds/mds_log.c
@@ -30,7 +30,7 @@
 #include <linux/module.h>
 #include <linux/version.h>
 
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/lustre_commit_confd.h>
diff --git a/lustre/mds/mds_unlink_open.c b/lustre/mds/mds_unlink_open.c
index b52f1e5..3f9e111 100644
--- a/lustre/mds/mds_unlink_open.c
+++ b/lustre/mds/mds_unlink_open.c
@@ -32,7 +32,7 @@
 #include <linux/module.h>
 #include <linux/version.h>
 
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/lustre_commit_confd.h>
diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index e87e1d5..21090cf 100644
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -67,7 +67,7 @@
 #include <linux/lustre_build_version.h>
 #include <linux/lustre_version.h>
 #endif
-#include <portals/list.h>
+#include <libcfs/list.h>
 
 #ifndef __KERNEL__
 /* liblustre workaround */
diff --git a/lustre/obdclass/llog_ioctl.c b/lustre/obdclass/llog_ioctl.c
index d036c2d..5644386 100644
--- a/lustre/obdclass/llog_ioctl.c
+++ b/lustre/obdclass/llog_ioctl.c
@@ -15,7 +15,7 @@
 #include <linux/fs.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_log.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 
 static int str2logid(struct llog_logid *logid, char *str, int len)
 {
diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c
index 7c94552..bcecaae 100644
--- a/lustre/obdclass/llog_obd.c
+++ b/lustre/obdclass/llog_obd.c
@@ -22,7 +22,7 @@
 #include <linux/obd_class.h>
 #include <linux/lustre_log.h>
 #include <linux/lustre_mds.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 
 /* helper functions for calling the llog obd methods */
 
diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c
index 46726e3..fa0bda6 100644
--- a/lustre/obdclass/obd_config.c
+++ b/lustre/obdclass/obd_config.c
@@ -37,7 +37,7 @@
 #endif
 #include <linux/lustre_log.h>
 #include <linux/lprocfs_status.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 
 
 /* Create a new device and set the type, name and uuid.  If
diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index d6a225a..b441bdb 100644
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -57,7 +57,7 @@
 #include <linux/lprocfs_status.h>
 #include <linux/lustre_log.h>
 #include <linux/lustre_commit_confd.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 
 #include <linux/lustre_smfs.h>
 #include "filter_internal.h"
diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c
index c271382..0237fc0 100644
--- a/lustre/obdfilter/filter_log.c
+++ b/lustre/obdfilter/filter_log.c
@@ -30,7 +30,7 @@
 #include <linux/module.h>
 #include <linux/version.h>
 
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/lustre_commit_confd.h>
diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c
index aa9a88b..0b569c3 100644
--- a/lustre/obdfilter/filter_lvb.c
+++ b/lustre/obdfilter/filter_lvb.c
@@ -30,7 +30,7 @@
 #include <linux/module.h>
 #include <linux/version.h>
 
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_dlm.h>
 
diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index fcfe939..f6f1a6c 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -49,7 +49,7 @@
 #endif
 
 #include <linux/lustre_dlm.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_net.h>
 #include <lustre/lustre_user.h>
 #include <linux/obd_ost.h>
diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 616edb5..c615015 100644
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -43,7 +43,7 @@
 #include <linux/init.h>
 #include <linux/lprocfs_status.h>
 #include <linux/lustre_commit_confd.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 
 void oti_init(struct obd_trans_info *oti, struct ptlrpc_request *req)
 {
diff --git a/lustre/ptlrpc/llog_client.c b/lustre/ptlrpc/llog_client.c
index aa9107a..4ebd88d 100644
--- a/lustre/ptlrpc/llog_client.c
+++ b/lustre/ptlrpc/llog_client.c
@@ -38,7 +38,7 @@
 #include <linux/obd_class.h>
 #include <linux/lustre_log.h>
 #include <linux/lustre_net.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 
 /* This is a callback from the llog_* functions.
  * Assumes caller has already pushed us into the kernel context. */
diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c
index 47205a5..141caa0 100644
--- a/lustre/ptlrpc/llog_net.c
+++ b/lustre/ptlrpc/llog_net.c
@@ -40,7 +40,7 @@
 
 #include <linux/obd_class.h>
 #include <linux/lustre_log.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include <linux/lvfs.h>
 
 #ifdef __KERNEL__
diff --git a/lustre/ptlrpc/llog_server.c b/lustre/ptlrpc/llog_server.c
index 6c81fa7..86f4824 100644
--- a/lustre/ptlrpc/llog_server.c
+++ b/lustre/ptlrpc/llog_server.c
@@ -38,7 +38,7 @@
 #include <linux/obd_class.h>
 #include <linux/lustre_log.h>
 #include <linux/lustre_net.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include <linux/lustre_fsfilt.h>
 
 #ifdef __KERNEL__
diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c
index 61ce8e6..b4eb13b 100644
--- a/lustre/ptlrpc/ptlrpcd.c
+++ b/lustre/ptlrpc/ptlrpcd.c
@@ -42,7 +42,7 @@
 # include <ctype.h>
 #endif
 
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_net.h>
 
 #include <linux/lustre_ha.h>
diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c
index 0462a55..ca6e22a 100644
--- a/lustre/ptlrpc/recov_thread.c
+++ b/lustre/ptlrpc/recov_thread.c
@@ -35,18 +35,18 @@
 #ifdef __KERNEL__
 #include <linux/fs.h>
 #else
-# include <portals/list.h>
+# include <libcfs/list.h>
 # include <liblustre.h>
 #endif
 
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_commit_confd.h>
 #include <linux/obd_support.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_net.h>
 #include <portals/types.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include <linux/lustre_log.h>
 #include "ptlrpc_internal.h"
 
diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 512f62d..fa924fc 100644
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -23,7 +23,7 @@
 #define DEBUG_SUBSYSTEM S_RPC
 #ifndef __KERNEL__
 #include <liblustre.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #endif
 #include <linux/obd_support.h>
 #include <linux/obd_class.h>
diff --git a/lustre/smfs/cache.c b/lustre/smfs/cache.c
index 2911adf..400da0a 100644
--- a/lustre/smfs/cache.c
+++ b/lustre/smfs/cache.c
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/lustre_idl.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 #include <linux/obd_class.h>
 #include <linux/obd_support.h>
 #include <linux/lustre_lib.h>
diff --git a/lustre/tests/mkdirdeep.c b/lustre/tests/mkdirdeep.c
index 1326c1e..8641d1d 100644
--- a/lustre/tests/mkdirdeep.c
+++ b/lustre/tests/mkdirdeep.c
@@ -16,7 +16,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <linux/limits.h>
-#include <portals/lltrace.h>
+#include <libcfs/lltrace.h>
 
 static int opt_verbose = 0;
 static int opt_trace = 0;
diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 48a135e..3c40db2 100644
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -52,10 +52,6 @@
 
 #include <asm/page.h>           /* needed for PAGE_SIZE - rread */
 
-#define __KERNEL__
-#include <linux/list.h>
-#undef __KERNEL__
-
 #include <linux/obd_class.h>
 #include <portals/ptlctl.h>
 #include "parser.h"