On Fri, Mar 13, 2020 at 05:31:43PM +0200, Nikolay Borisov wrote:
> Kernel has removed support for this feature in 5.7 so let's remove
> support from progs as well.
>
> Signed-off-by: Nikolay Borisov <nborisov@xxxxxxxx>
> ---
> ioctl.h | 4 +---
> libbtrfsutil/btrfs.h | 4 +---
> libbtrfsutil/subvolume.c | 4 ----
> 3 files changed, 2 insertions(+), 10 deletions(-)
We should also update the docs in libbtrfsutil/btrfsutil.h and
libbtrfsutil/python/module.c to note that async_transid/async_ is now
ignored, remove the mentions of asynchronous creation from
libbtrfsutil/README.md, and remove the async_ tests in
libbtrfsutil/python/tests/test_subvolume.py.
> diff --git a/ioctl.h b/ioctl.h
> index d3dfd6375de1..93a19a5789b6 100644
> --- a/ioctl.h
> +++ b/ioctl.h
> @@ -49,14 +49,12 @@ BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096);
>
> #define BTRFS_DEVICE_PATH_NAME_MAX 1024
>
> -#define BTRFS_SUBVOL_CREATE_ASYNC (1ULL << 0)
> #define BTRFS_SUBVOL_RDONLY (1ULL << 1)
> #define BTRFS_SUBVOL_QGROUP_INHERIT (1ULL << 2)
> #define BTRFS_DEVICE_SPEC_BY_ID (1ULL << 3)
>
> #define BTRFS_VOL_ARG_V2_FLAGS_SUPPORTED \
> - (BTRFS_SUBVOL_CREATE_ASYNC | \
> - BTRFS_SUBVOL_RDONLY | \
> + (BTRFS_SUBVOL_RDONLY | \
> BTRFS_SUBVOL_QGROUP_INHERIT | \
> BTRFS_DEVICE_SPEC_BY_ID)
>
> diff --git a/libbtrfsutil/btrfs.h b/libbtrfsutil/btrfs.h
> index 944d50132456..03ac58372104 100644
> --- a/libbtrfsutil/btrfs.h
> +++ b/libbtrfsutil/btrfs.h
> @@ -38,8 +38,7 @@ struct btrfs_ioctl_vol_args {
> #define BTRFS_DEVICE_SPEC_BY_ID (1ULL << 3)
>
> #define BTRFS_VOL_ARG_V2_FLAGS_SUPPORTED \
> - (BTRFS_SUBVOL_CREATE_ASYNC | \
> - BTRFS_SUBVOL_RDONLY | \
> + (BTRFS_SUBVOL_RDONLY | \
> BTRFS_SUBVOL_QGROUP_INHERIT | \
> BTRFS_DEVICE_SPEC_BY_ID)
>
> @@ -101,7 +100,6 @@ struct btrfs_ioctl_qgroup_limit_args {
> * - BTRFS_IOC_SUBVOL_GETFLAGS
> * - BTRFS_IOC_SUBVOL_SETFLAGS
> */
> -#define BTRFS_SUBVOL_CREATE_ASYNC (1ULL << 0)
> #define BTRFS_SUBVOL_RDONLY (1ULL << 1)
> #define BTRFS_SUBVOL_QGROUP_INHERIT (1ULL << 2)
>
> diff --git a/libbtrfsutil/subvolume.c b/libbtrfsutil/subvolume.c
> index 3f8343a245e9..27a6bb8130ed 100644
> --- a/libbtrfsutil/subvolume.c
> +++ b/libbtrfsutil/subvolume.c
> @@ -716,8 +716,6 @@ PUBLIC enum btrfs_util_error btrfs_util_create_subvolume_fd(int parent_fd,
> return BTRFS_UTIL_ERROR_INVALID_ARGUMENT;
> }
>
> - if (async_transid)
> - args.flags |= BTRFS_SUBVOL_CREATE_ASYNC;
> if (qgroup_inherit) {
> args.flags |= BTRFS_SUBVOL_QGROUP_INHERIT;
> args.qgroup_inherit = (struct btrfs_qgroup_inherit *)qgroup_inherit;
> @@ -1153,8 +1151,6 @@ PUBLIC enum btrfs_util_error btrfs_util_create_snapshot_fd2(int fd,
>
> if (flags & BTRFS_UTIL_CREATE_SNAPSHOT_READ_ONLY)
> args.flags |= BTRFS_SUBVOL_RDONLY;
> - if (async_transid)
> - args.flags |= BTRFS_SUBVOL_CREATE_ASYNC;
> if (qgroup_inherit) {
> args.flags |= BTRFS_SUBVOL_QGROUP_INHERIT;
> args.qgroup_inherit = (struct btrfs_qgroup_inherit *)qgroup_inherit;
Please remove all of the handling for async_transid from this file.
