From: nikita Date: Sat, 18 Oct 2008 17:41:47 +0000 (+0000) Subject: Liblustre build fixes. X-Git-Tag: v1_9_90~43 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=bcef68d99fdb09fe5b55b2f95507e18f63e849ab;p=fs%2Flustre-release.git Liblustre build fixes. --- diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 6a4604d..66e874b 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -1713,6 +1713,10 @@ Bugzilla : 16450 Description: Use cdebug_show() in CDEBUG-style macros defined outside of libcfs. Details : Use cdebug_show() in CDEBUG-style macros defined outside of libcfs. +Severity : normal +Bugzilla : 16450 +Description: Liblustre build fixes. +Details : Liblustre build fixes. -------------------------------------------------------------------------------- diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index 43ae1b7..21bc557 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -385,8 +385,6 @@ static inline void fid_be_to_cpu(struct lu_fid *dst, const struct lu_fid *src) LASSERTF(fid_is_igif(dst) || fid_ver(dst) == 0, DFID"\n", PFID(dst)); } -#ifdef __KERNEL__ - /** * Storage representation for fids. * @@ -402,9 +400,6 @@ void fid_pack(struct lu_fid_pack *pack, const struct lu_fid *fid, struct lu_fid *befider); int fid_unpack(const struct lu_fid_pack *pack, struct lu_fid *fid); -/* __KERNEL__ */ -#endif - static inline int fid_is_sane(const struct lu_fid *fid) { return diff --git a/lustre/obdclass/lu_time.c b/lustre/obdclass/lu_time.c index 3751812..66a8687 100644 --- a/lustre/obdclass/lu_time.c +++ b/lustre/obdclass/lu_time.c @@ -47,6 +47,7 @@ # define EXPORT_SYMTAB #endif +#include /* OBD_{ALLOC,FREE}_PTR() */ #include #include