From: Christopher J. Morrone <morrone2@llnl.gov>
Date: Mon, 8 Aug 2011 12:30:44 +0000 (-0400)
Subject: LU-533 Include posix-types.h in headers and distribution
X-Git-Tag: 2.1.0-RC0~24
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=f8e7a89c87b9d668d29f9ec31246e369205cc196;p=fs%2Flustre-release.git

LU-533 Include posix-types.h in headers and distribution

Include libcfs/posix/posix-types.h in the main rpm, and
add #include statements in lustre_user.h and ll_fiemap.h.
This will allow user-space applications that include these
files to compile.

Change-Id: Ibe391bf28afe91b3914ca1eb07fe66e408b21b4a
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-on: http://review.whamcloud.com/1138
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/libcfs/include/libcfs/posix/Makefile.am b/libcfs/include/libcfs/posix/Makefile.am
index feba1d5..ca5c0da 100644
--- a/libcfs/include/libcfs/posix/Makefile.am
+++ b/libcfs/include/libcfs/posix/Makefile.am
@@ -1 +1,7 @@
+libcfsposixdir = $(includedir)/libcfs/posix
+
+if UTILS
+libcfsposix_HEADERS = posix-types.h
+endif
+
 EXTRA_DIST := libcfs.h posix-wordsize.h posix-types.h
diff --git a/lustre.spec.in b/lustre.spec.in
index acb94fa..cd914af 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -226,6 +226,7 @@ cat >lustre.files <<EOF
 %attr(-, root, root) %{_libdir}/libptlctl.a
 %attr(-, root, root) %{_libdir}/liblustreapi.a
 %attr(-, root, root) /usr/include/lustre
+%attr(-, root, root) /usr/include/libcfs
 
 %attr(-, root, root) %{_mandir}/man?/*
 
diff --git a/lustre/include/lustre/ll_fiemap.h b/lustre/include/lustre/ll_fiemap.h
index 8e03ab6..ebfd585 100644
--- a/lustre/include/lustre/ll_fiemap.h
+++ b/lustre/include/lustre/ll_fiemap.h
@@ -47,6 +47,10 @@
 
 #if !defined(HAVE_LINUX_FIEMAP_H) || !defined(__KERNEL__)
 
+#ifndef __KERNEL__
+#include <libcfs/posix/posix-types.h>
+#endif
+
 struct ll_fiemap_extent {
         __u64 fe_logical;  /* logical offset in bytes for the start of
                             * the extent from the beginning of the file */
diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h
index ccf703a..d0da8a8 100644
--- a/lustre/include/lustre/lustre_user.h
+++ b/lustre/include/lustre/lustre_user.h
@@ -46,6 +46,9 @@
  * @{
  */
 
+#ifndef __KERNEL__
+#include <libcfs/posix/posix-types.h>
+#endif
 #include <lustre/ll_fiemap.h>
 #if defined(__linux__)
 #include <linux/lustre_user.h>