btrfs: re-instantiate the removed BTRFS_SUBVOL_CREATE_ASYNC definition
PATCH 1/1 btrfs: re-instantiate the removed BTRFS_SUBVOL_CREATE_ASYNC definition
The commit 9c1036fdb1d1ff1b ("btrfs: Remove BTRFS_SUBVOL_CREATE_ASYNC support") breaks strace build with the kernel headers from git:
btrfs.c: In function "btrfs_test_subvol_ioctls":
btrfs.c:531:23: error: "BTRFS_SUBVOL_CREATE_ASYNC" undeclared (first use in this function)
vol_args_v2.flags = BTRFS_SUBVOL_CREATE_ASYNC;
Moreover, it is improper to break UAPI anyway.
Restore the macro definition and put it under "#ifndef __KERNEL__" in order to prevent inadvertent in-kernel usage.
--- include/uapi/linux/btrfs.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
include/uapi/linux/btrfs.h +4 -6
@@ -36,12 +36,10 @@ struct btrfs_ioctl_vol_args {#define BTRFS_DEVICE_PATH_NAME_MAX 1024#define BTRFS_SUBVOL_NAME_MAX 4039 -/* -* Deprecated since 5.7: -* -* BTRFS_SUBVOL_CREATE_ASYNC (1ULL << 0) -*/ - +#ifndef __KERNEL__ +/* Deprecated since 5.7 */ +# define BTRFS_SUBVOL_CREATE_ASYNC (1ULL << 0) +#endif #define BTRFS_SUBVOL_RDONLY (1ULL << 1)#define BTRFS_SUBVOL_QGROUP_INHERIT (1ULL << 2)
Signature · 1 line
2.1.4
Quoted 8 lines · Eugene Syromiatnikov
The commit
9c1036fdb1d1ff1b("btrfs: RemoveBTRFS_SUBVOL_CREATE_ASYNCsupport") breaks strace build with the kernel headers from git:
btrfs.c: In function "btrfs_test_subvol_ioctls":
btrfs.c:531:23: error: "BTRFS_SUBVOL_CREATE_ASYNC" undeclared (first use in this function)
vol_args_v2.flags =BTRFS_SUBVOL_CREATE_ASYNC;
Quoted 7 lines
Moreover, it is improper to break UAPI anyway.
Restore the macro definition and put it under "#ifndef
__KERNEL__" in order to prevent inadvertent in-kernel usage.Fixes 9c1036fdb1d1ff1b ("btrfs: Remove BTRFS_SUBVOL_CREATE_ASYNC support")Signed-off-by Eugene Syromiatnikov <[email protected]>
Ops, sorry about that:
Quoted 26 lines
--- include/uapi/linux/btrfs.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)include/uapi/linux/btrfs.h +4
-6@@ -36,12 +36,10 @@ struct btrfs_ioctl_vol_args {#define BTRFS_DEVICE_PATH_NAME_MAX 1024#define BTRFS_SUBVOL_NAME_MAX 4039 -/* -* Deprecated since 5.7: -* -* BTRFS_SUBVOL_CREATE_ASYNC (1ULL << 0) -*/ - +#ifndef __KERNEL__ +/* Deprecated since 5.7 */ +# define BTRFS_SUBVOL_CREATE_ASYNC (1ULL << 0) +#endif #define BTRFS_SUBVOL_RDONLY (1ULL << 1)#define BTRFS_SUBVOL_QGROUP_INHERIT (1ULL << 2)
Quoted 9 lines · Eugene Syromiatnikov
The commit
9c1036fdb1d1ff1b("btrfs: RemoveBTRFS_SUBVOL_CREATE_ASYNCsupport") breaks strace build with the kernel headers from git:
btrfs.c: In function "btrfs_test_subvol_ioctls":
btrfs.c:531:23: error: "BTRFS_SUBVOL_CREATE_ASYNC" undeclared (first use in this function)
vol_args_v2.flags =BTRFS_SUBVOL_CREATE_ASYNC;Moreover, it is improper to break UAPI anyway.
IIRC the reason for the UAPI exports was to let strace use the includes to decode the ioctls, so for that I agree it's improper to break the build, sorry. The ioctls are a public interface so it's an ABI. Patch added to 5.7 queue, thanks.