#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)
#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 */
#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
#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>
#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
# include <asm/types.h>
# include <stdint.h>
#endif
-# include <portals/list.h>
+# include <libcfs/list.h>
# include <string.h>
#endif
# 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>
#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,
#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>
#endif
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
// #include <linux/obd.h>
#include <portals/p30.h>
#include <linux/lustre_idl.h>
#ifndef __LVFS_H__
#define __LVFS_H__
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#define LL_ID_NAMELEN (16 + 1 + 8 + 1)
#ifndef __KERNEL__
#include <sys/types.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#else
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <linux/slab.h>
#include <linux/highmem.h>
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_compat25.h>
/* global variables */
#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
# include <linux/lustre_dlm.h>
#else
# include <liblustre.h>
-# include <linux/kp30.h>
+# include <libcfs/kp30.h>
#endif
#include <linux/obd_class.h>
#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;
#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);
#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>
#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>
#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>
#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>
#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>
#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.
#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>
#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>
#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>
#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"
#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>
#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>
#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>
#include <linux/lustre_build_version.h>
#include <linux/lustre_version.h>
#endif
-#include <portals/list.h>
+#include <libcfs/list.h>
#ifndef __KERNEL__
/* liblustre workaround */
#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)
{
#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 */
#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
#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"
#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>
#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>
#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>
#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)
{
#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. */
#include <linux/obd_class.h>
#include <linux/lustre_log.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/lvfs.h>
#ifdef __KERNEL__
#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__
# include <ctype.h>
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_net.h>
#include <linux/lustre_ha.h>
#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"
#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>
#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>
#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;
#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"