diff options
| author | Nathan Scott <nathans@sgi.com> | 2004-10-04 00:20:59 +0000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2004-10-04 00:20:59 +0000 |
| commit | 8d95848d4e13fbe30df286e3f8908be78e03d423 (patch) | |
| tree | d0a889c630e2ca18a71449ed48507cd205d61cb6 | |
| parent | 7b0a58cc3dcc0ce6d9d700c645331eb29bd9af08 (diff) | |
| download | dmapi-dev-8d95848d4e13fbe30df286e3f8908be78e03d423.tar.gz | |
Fix DMAPI userspace source to include fewer kernel headers directly, and include XFS headers via the usual libxfs.h interface.
| -rw-r--r-- | include/dmapi_kern.h | 2 | ||||
| -rw-r--r-- | libdm/dm_handle.c | 13 | ||||
| -rw-r--r-- | libdm/dm_handle2path.c | 6 |
3 files changed, 8 insertions, 13 deletions
diff --git a/include/dmapi_kern.h b/include/dmapi_kern.h index 0db824a..02f918b 100644 --- a/include/dmapi_kern.h +++ b/include/dmapi_kern.h @@ -33,8 +33,6 @@ #ifndef __DMAPI_KERN_H__ #define __DMAPI_KERN_H__ -#include <linux/fs.h> - union sys_dmapi_uarg { void *p; __u64 u; diff --git a/libdm/dm_handle.c b/libdm/dm_handle.c index b5e3429..03bf330 100644 --- a/libdm/dm_handle.c +++ b/libdm/dm_handle.c @@ -31,21 +31,20 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ +#ifdef linux +#include <xfs/libxfs.h> +#include <xfs/handle.h> +#else +#include <sys/handle.h> #include <errno.h> #include <stdlib.h> #include <string.h> +#endif #include <dmapi.h> #include <dmapi_kern.h> #include "dmapi_lib.h" -#ifdef linux -#include <xfs/xfs_fs.h> -#include <xfs/handle.h> -#else -#include <sys/handle.h> -#endif - typedef enum { DM_HANDLE_GLOBAL, DM_HANDLE_FILESYSTEM, diff --git a/libdm/dm_handle2path.c b/libdm/dm_handle2path.c index f5e6e26..8a868ae 100644 --- a/libdm/dm_handle2path.c +++ b/libdm/dm_handle2path.c @@ -41,13 +41,11 @@ #include <unistd.h> #include <mntent.h> #ifdef linux -#include <linux/types.h> -#include <unistd.h> -#include <syscall.h> -#include <xfs/xfs_fs.h> +#include <xfs/libxfs.h> #include <xfs/handle.h> #include <asm/posix_types.h> #include <linux/dirent.h> +#include <syscall.h> #endif #include <dmapi.h> |