diff options
| author | Jakub Kicinski <[email protected]> | 2023-12-01 00:10:40 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2023-12-01 00:11:19 +0000 |
| commit | 975f2d73a99f35b57ffa2ad7bff8562225cdcfcb (patch) | |
| tree | d6c9ce96cfd889281e003a310c79d5a12a3cf924 /fs/btrfs/ioctl.c | |
| parent | net: page_pool: fix general protection fault in page_pool_unlist (diff) | |
| parent | Merge tag 'net-6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | kernel-975f2d73a99f35b57ffa2ad7bff8562225cdcfcb.tar.gz kernel-975f2d73a99f35b57ffa2ad7bff8562225cdcfcb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Signed-off-by: Jakub Kicinski <[email protected]>
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 |