shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

btrfs-util: expose SIGINT behaviour in snapshot copy fallback, too

Browse Source
This commit is contained in:
Lennart Poettering 2019-07-17 10:58:49 +02:00
parent 85559592a6
commit 07a30bb18a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/basic/btrfs-util.c
View File

@ -1624,7 +1624,7 @@ int btrfs_subvol_snapshot_fd_full(
} else if (r < 0) } else if (r < 0)
return r; return r;
r = copy_directory_fd_full(old_fd, new_path, COPY_MERGE|COPY_REFLINK|COPY_SAME_MOUNT, progress_path, progress_bytes, userdata); r = copy_directory_fd_full(old_fd, new_path, COPY_MERGE|COPY_REFLINK|COPY_SAME_MOUNT|(FLAGS_SET(flags, BTRFS_SNAPSHOT_SIGINT) ? COPY_SIGINT : 0), progress_path, progress_bytes, userdata);
if (r < 0) if (r < 0)
goto fallback_fail; goto fallback_fail;

1
src/basic/btrfs-util.h
View File

@ -34,6 +34,7 @@ typedef enum BtrfsSnapshotFlags {
BTRFS_SNAPSHOT_QUOTA = 1 << 3, BTRFS_SNAPSHOT_QUOTA = 1 << 3,
BTRFS_SNAPSHOT_FALLBACK_DIRECTORY = 1 << 4, /* If the destination doesn't support subvolumes, reflink/copy instead */ BTRFS_SNAPSHOT_FALLBACK_DIRECTORY = 1 << 4, /* If the destination doesn't support subvolumes, reflink/copy instead */
BTRFS_SNAPSHOT_FALLBACK_IMMUTABLE = 1 << 5, /* When we can't create a subvolume, use the FS_IMMUTABLE attribute for indicating read-only */ BTRFS_SNAPSHOT_FALLBACK_IMMUTABLE = 1 << 5, /* When we can't create a subvolume, use the FS_IMMUTABLE attribute for indicating read-only */
BTRFS_SNAPSHOT_SIGINT = 1 << 6, /* Check for SIGINT regularly, and return EINTR if seen */
} BtrfsSnapshotFlags; } BtrfsSnapshotFlags;
typedef enum BtrfsRemoveFlags { typedef enum BtrfsRemoveFlags {