From 13f5582da6a6f86bb23b8451b9b87a2bf666a101 Mon Sep 17 00:00:00 2001 From: zab Date: Wed, 3 Mar 2004 00:58:31 +0000 Subject: [PATCH] - temporarily disable building some dirs when cray portals are in use - revert the overly aggressive migration of portals/list.h - make sure all builds see -DCRAY_PORTALS. this is gross. - protect the libcfs ioctl registration with __KERNEL__ - avoid portals_nid2str() as it breaks the compiler --- lnet/include/linux/libcfs.h | 7 ++++++- lustre/portals/include/linux/libcfs.h | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lnet/include/linux/libcfs.h b/lnet/include/linux/libcfs.h index e4b414d..7167933 100644 --- a/lnet/include/linux/libcfs.h +++ b/lnet/include/linux/libcfs.h @@ -3,7 +3,6 @@ */ #ifndef _LIBCFS_H -#include #define PORTAL_DEBUG @@ -197,6 +196,10 @@ struct portal_ioctl_data { char ioc_bulk[0]; }; +#ifdef __KERNEL__ + +#include + struct libcfs_ioctl_handler { struct list_head item; int (*handle_ioctl)(struct portal_ioctl_data *data, @@ -212,6 +215,8 @@ struct libcfs_ioctl_handler { int libcfs_register_ioctl(struct libcfs_ioctl_handler *hand); int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand); +#endif + #define _LIBCFS_H #endif /* _LIBCFS_H */ diff --git a/lustre/portals/include/linux/libcfs.h b/lustre/portals/include/linux/libcfs.h index e4b414d..7167933 100644 --- a/lustre/portals/include/linux/libcfs.h +++ b/lustre/portals/include/linux/libcfs.h @@ -3,7 +3,6 @@ */ #ifndef _LIBCFS_H -#include #define PORTAL_DEBUG @@ -197,6 +196,10 @@ struct portal_ioctl_data { char ioc_bulk[0]; }; +#ifdef __KERNEL__ + +#include + struct libcfs_ioctl_handler { struct list_head item; int (*handle_ioctl)(struct portal_ioctl_data *data, @@ -212,6 +215,8 @@ struct libcfs_ioctl_handler { int libcfs_register_ioctl(struct libcfs_ioctl_handler *hand); int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand); +#endif + #define _LIBCFS_H #endif /* _LIBCFS_H */ -- 1.8.3.1