After my change to the original patch that resulted in commit 8ed874b39b3 it was brought to my attention that all three defines are the same: FICLONE = BTRFS_IOC_CLONE = XFS_IOC_CLONE. Therefore we should prefer generic FICLONE over 'specific' defines for btrfs/xfs. Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- src/storage/storage_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index da99043e0a..715d5c2f88 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -46,14 +46,14 @@ # include <selinux/selinux.h> #endif -#if HAVE_LINUX_BTRFS_H +#ifdef FICLONE +# define REFLINK_IOC_CLONE FICLONE +#elif HAVE_LINUX_BTRFS_H # include <linux/btrfs.h> # define REFLINK_IOC_CLONE BTRFS_IOC_CLONE #elif HAVE_XFS_XFS_H # include <xfs/xfs.h> # define REFLINK_IOC_CLONE XFS_IOC_CLONE -#elif defined(FICLONE) -# define REFLINK_IOC_CLONE FICLONE #endif #include "datatypes.h" -- 2.16.4 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
