diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-14 20:51:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-14 20:51:30 +0200 |
| commit | 6cc9306b8fc03019e81e4f10c93ff0528cba5217 (patch) | |
| tree | a725667615bb43c91a73b9f18256c64b4b03ef72 /include | |
| parent | Merge tag 'afs-fixes-20200413' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | btrfs: re-instantiate the removed BTRFS_SUBVOL_CREATE_ASYNC definition (diff) | |
| download | linux-6cc9306b8fc03019e81e4f10c93ff0528cba5217.tar.xz linux-6cc9306b8fc03019e81e4f10c93ff0528cba5217.zip | |
Merge tag 'for-5.7-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"We have a few regressions and one fix for stable:
- revert fsync optimization
- fix lost i_size update
- fix a space accounting leak
- build fix, add back definition of a deprecated ioctl flag
- fix search condition for old roots in relocation"
* tag 'for-5.7-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: re-instantiate the removed BTRFS_SUBVOL_CREATE_ASYNC definition
btrfs: fix reclaim counter leak of space_info objects
btrfs: make full fsyncs always operate on the entire file again
btrfs: fix lost i_size update after cloning inline extent
btrfs: check commit root generation in should_ignore_root
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/btrfs.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 8134924cfc17..e6b6cb0f8bc6 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -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) |