From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cantor2.suse.de ([195.135.220.15]:42935 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932741AbaBFN7W (ORCPT ); Thu, 6 Feb 2014 08:59:22 -0500 From: David Disseldorp To: xfs@oss.sgi.com Cc: dsterba@suse.cz, linux-btrfs@vger.kernel.org, David Disseldorp Subject: [PATCH v2 2/3] src/cloner: use btrfs/ioctl.h header if present Date: Thu, 6 Feb 2014 14:59:13 +0100 Message-Id: <1391695154-2039-3-git-send-email-ddiss@suse.de> In-Reply-To: <1391695154-2039-1-git-send-email-ddiss@suse.de> References: <1391695154-2039-1-git-send-email-ddiss@suse.de> Sender: linux-btrfs-owner@vger.kernel.org List-ID: 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 --- configure.ac | 1 + src/cloner.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index bd48fd9..6fba3ad 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/cloner.c b/src/cloner.c index dfce837..ccc2354 100644 --- a/src/cloner.c +++ b/src/cloner.c @@ -30,6 +30,9 @@ #include #include #include +#ifdef HAVE_BTRFS_IOCTL_H +#include +#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) -- 1.8.4.5