提交 8ed874b3 编写于 作者: J Julio Faracco 提交者: Michal Privoznik

storage: Rename btrfsCloneFile to support other filesystems.

This commit renames and adds other macros to support aother filesystems
when a reflink is performed. After that, XFS filesystems (and others)
with reflink support will be able to clone.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1565004Signed-off-by: NJulio Faracco <jcfaracco@gmail.com>
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 2e11298f
......@@ -48,6 +48,12 @@
#if 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"
......@@ -80,22 +86,23 @@ VIR_LOG_INIT("storage.storage_util");
* Perform the O(1) btrfs clone operation, if possible.
* Upon success, return 0. Otherwise, return -1 and set errno.
*/
#if HAVE_LINUX_BTRFS_H
#ifdef REFLINK_IOC_CLONE
static inline int
btrfsCloneFile(int dest_fd, int src_fd)
reflinkCloneFile(int dest_fd, int src_fd)
{
return ioctl(dest_fd, BTRFS_IOC_CLONE, src_fd);
return ioctl(dest_fd, REFLINK_IOC_CLONE, src_fd);
}
#else
static inline int
btrfsCloneFile(int dest_fd ATTRIBUTE_UNUSED,
int src_fd ATTRIBUTE_UNUSED)
reflinkCloneFile(int dest_fd ATTRIBUTE_UNUSED,
int src_fd ATTRIBUTE_UNUSED)
{
errno = ENOTSUP;
return -1;
}
#endif
static int ATTRIBUTE_NONNULL(2)
virStorageBackendCopyToFD(virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol,
......@@ -142,7 +149,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol,
}
if (reflink_copy) {
if (btrfsCloneFile(fd, inputfd) < 0) {
if (reflinkCloneFile(fd, inputfd) < 0) {
ret = -errno;
virReportSystemError(errno,
_("failed to clone files from '%s'"),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册