Use xfs.h rather than libxfs.h

Use xfs/xfs.h when possible rather than xfs/libxfs.h,
now that libxfs.h isn't part of a normal xfsprogs-devel
install.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/aclocal.m4 b/aclocal.m4
index 52f1c7da0fbfe52a67fb96ca46adb1acad952d48..6cc5dceb320ebc2c908512aaab9e5337baf78b1d 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -405,6 +405,17 @@ AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE],
     AC_SUBST(libuuid)
   ])
 
+AC_DEFUN([AC_PACKAGE_NEED_XFS_XFS_H],
+  [ AC_CHECK_HEADERS([xfs/xfs.h])
+    if test "$ac_cv_header_xfs_xfs_h" != "yes"; then
+        echo
+        echo 'FATAL ERROR: cannot find a valid <xfs/xfs.h> header file.'
+        echo 'Install or upgrade the XFS development package.'
+        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
+        exit 1
+    fi
+  ])
+
 AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
   [ AC_CHECK_HEADERS([xfs/libxfs.h])
     if test "$ac_cv_header_xfs_libxfs_h" != "yes"; then
@@ -500,8 +511,8 @@ AC_DEFUN([AC_PACKAGE_NEED_IRIX_LIBHANDLE],
   ])
 
 AC_DEFUN([AC_PACKAGE_NEED_XFSCTL_MACRO],
-  [ AC_MSG_CHECKING([xfsctl from xfs/libxfs.h])
-    AC_TRY_LINK([#include <xfs/libxfs.h>], [ int x = xfsctl(0, 0, 0, 0); ],
+  [ AC_MSG_CHECKING([xfsctl from xfs/xfs.h])
+    AC_TRY_LINK([#include <xfs/xfs.h>], [ int x = xfsctl(0, 0, 0, 0); ],
       [ echo ok ],
       [ echo
         echo 'FATAL ERROR: cannot find required macros in the XFS headers.'

diff --git a/configure.in b/configure.in
index 32a2496bd83889bfdbbb9f442ef9d2facb7c2f9c..f087454336241748ccb248e1c199e958459b0a9e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -44,6 +44,7 @@ in
                ;;
        *)
                AC_MULTILIB($enable_lib64)
+               AC_PACKAGE_NEED_XFS_XFS_H
                AC_PACKAGE_NEED_XFS_LIBXFS_H
                AC_PACKAGE_NEED_XFS_XQM_H
                AC_PACKAGE_NEED_XFSCTL_MACRO

diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4
index cafd9597c2abfdb1f9826eda1390f2d665c9f546..2c8d694703133ec57da1e82bf690ceb2f776f03d 100644 (file)
--- a/m4/package_xfslibs.m4
+++ b/m4/package_xfslibs.m4
@@ -1,3 +1,13 @@
+AC_DEFUN([AC_PACKAGE_NEED_XFS_XFS_H],
+  [ AC_CHECK_HEADERS([xfs/xfs.h])
+    if test "$ac_cv_header_xfs_xfs_h" != "yes"; then
+        echo
+        echo 'FATAL ERROR: cannot find a valid <xfs/xfs.h> header file.'
+        echo 'Run "make install-qa" from the xfsprogs source.'
+        exit 1
+    fi
+  ])
+
 AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
   [ AC_CHECK_HEADERS([xfs/libxfs.h])
     if test "$ac_cv_header_xfs_libxfs_h" != "yes"; then

diff --git a/src/global.h b/src/global.h
index 158c1faca7950d2c3a41e79afb0cd64bc70821c0..61862f60b92e26518223a056e296585716f1df2a 100644 (file)
--- a/src/global.h
+++ b/src/global.h
@@ -26,6 +26,10 @@
 #include <../../xfsprogs/include/irix.h>
 #endif
 
+#ifdef HAVE_XFS_XFS_H
+#include <xfs/xfs.h>
+#endif
+
 #ifdef HAVE_XFS_LIBXFS_H
 #include <xfs/libxfs.h>
 #endif

diff --git a/src/godown.c b/src/godown.c
index 4105aeef664b8e2c4de3bc3f79bbff6664325d32..07b6980778b3682511893ad972c1edd3f872d624 100644 (file)
--- a/src/godown.c
+++ b/src/godown.c
@@ -18,20 +18,6 @@
 
 #include "global.h"
 
-/* These should be in libxfs.h */
-#ifndef XFS_IOC_GOINGDOWN
-#define XFS_IOC_GOINGDOWN           _IOR ('X', 125, __uint32_t)
-#endif
-#ifndef XFS_FSOP_GOING_FLAGS_DEFAULT
-#define XFS_FSOP_GOING_FLAGS_DEFAULT    0x0     /* going down */
-#endif
-#ifndef XFS_FSOP_GOING_FLAGS_LOGFLUSH
-#define XFS_FSOP_GOING_FLAGS_LOGFLUSH    0x1     /* flush log */
-#endif
-#ifndef XFS_FSOP_GOING_FLAGS_NOLOGFLUSH
-#define XFS_FSOP_GOING_FLAGS_NOLOGFLUSH  0x2     /* don't flush log */
-#endif
-
 static char *xprogname;
 
 

diff --git a/src/iopat.c b/src/iopat.c
index 1e7d61b396d7780c15a69c80315f0888e1d9f5d0..c06071f92f72e95cfed4851969ccba470d75e608 100644 (file)
--- a/src/iopat.c
+++ b/src/iopat.c
@@ -18,7 +18,7 @@
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 struct xfs_flock64 f;
 
 int main(int argc, char **argv)

diff --git a/src/t_immutable.c b/src/t_immutable.c
index 667355b85d99bfe71625781821f5a946ffb6e58d..07a36cdc858cef6ea0ecc7d9973d0a9f596f9ecc 100644 (file)
--- a/src/t_immutable.c
+++ b/src/t_immutable.c
@@ -38,7 +38,7 @@
 #include <libgen.h>
 #include <sys/acl.h>
 #include <attr/xattr.h>
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/handle.h>
 #include <xfs/jdm.h>
 
@@ -47,6 +47,10 @@
 #define EXT2_APPEND_FL          0x00000020
 #define EXT2_IOC_SETFLAGS      _IOW('f', 2, long)
 
+#ifndef XFS_SUPER_MAGIC
+#define XFS_SUPER_MAGIC 0x58465342
+#endif
+
 extern const char *__progname;
 
 static int fsetflag(const char *path, int fd, int on, int immutable)

diff --git a/src/unwritten_mmap.c b/src/unwritten_mmap.c
index 5e63486451073ff1b4d345af63749cc3250ed972..aec6a69e9bb1af1256f3b8f1d01475ea6068c5a9 100644 (file)
--- a/src/unwritten_mmap.c
+++ b/src/unwritten_mmap.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <sys/mman.h>
 
 /*

diff --git a/src/xfsctl.c b/src/xfsctl.c
index f8afb162127349a1f39fb1f72ba9277c40585c85..8fa3348829e6ca4ed2a5cff286ecebccf0324d4a 100644 (file)
--- a/src/xfsctl.c
+++ b/src/xfsctl.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include <xfs/xfs.h>
 #include <xfs/jdm.h>
 
 /* simple test program to try out a bunch of xfsctls: