src/cloner: use btrfs/ioctl.h header if present
authorDavid Disseldorp <ddiss@suse.de>
Tue, 18 Feb 2014 06:18:42 +0000 (17:18 +1100)
committerDave Chinner <david@fromorbit.com>
Tue, 18 Feb 2014 06:18:42 +0000 (17:18 +1100)
Check for the btrfsprogs-devel ioctl.h header at configure time. Use it
in src/cloner if present, otherwise fall back to using the copied clone
ioctl definitions.

Signed-off-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
configure.ac
src/cloner.c

index bd48fd9..6fba3ad 100644 (file)
@@ -30,6 +30,7 @@ AC_HEADER_STDC
     AC_CHECK_HEADERS([ sys/fs/xfs_fsops.h      \
                        sys/fs/xfs_itable.h     \
                        xfs/platform_defs.h     \
+                       btrfs/ioctl.h           \
     ])
 
 AC_PACKAGE_NEED_UUIDCOMPARE
index dfce837..ccc2354 100644 (file)
@@ -30,6 +30,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#ifdef HAVE_BTRFS_IOCTL_H
+#include <btrfs/ioctl.h>
+#else
 
 struct btrfs_ioctl_clone_range_args {
        int64_t src_fd;
@@ -42,6 +45,7 @@ struct btrfs_ioctl_clone_range_args {
 #define BTRFS_IOC_CLONE       _IOW(BTRFS_IOCTL_MAGIC, 9, int)
 #define BTRFS_IOC_CLONE_RANGE _IOW(BTRFS_IOCTL_MAGIC, 13, \
                                   struct btrfs_ioctl_clone_range_args)
+#endif
 
 static void
 usage(char *name, const char *msg)