diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-04 07:42:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-04 07:42:16 +0100 |
| commit | 4906f39a1343713a4fb3fe78aecd12eba5257dc0 (patch) | |
| tree | 2487e32b1e02681683a842f26bbc05e9d1aba308 /fs/btrfs/ioctl.c | |
| parent | af54d778a03853801d681c98c0c2a6c316ef9ca7 (diff) | |
| parent | 33cc938e65a98f1d29d0a18403dbbee050dcad9a (diff) | |
Merge 6.7-rc4 into char-misc-linus
We need 6.7-rc4 in here as we need to revert one of the debugfs changes
that came in that release through the wireless tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index dfe257e1845b..4e50b62db2a8 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -4356,6 +4356,7 @@ static int _btrfs_ioctl_send(struct inode *inode, void __user *argp, bool compat arg->clone_sources = compat_ptr(args32.clone_sources); arg->parent_root = args32.parent_root; arg->flags = args32.flags; + arg->version = args32.version; memcpy(arg->reserved, args32.reserved, sizeof(args32.reserved)); #else |