Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: fix ioctl arg size (userland incompatible change!)
Btrfs: Clear the device->running_pending flag before bailing on congestion
+11
-7
+8
-6
fs/btrfs/ioctl.h
+8
-6
fs/btrfs/ioctl.h
···
22
22
23
23
#define BTRFS_IOCTL_MAGIC 0x94
24
24
#define BTRFS_VOL_NAME_MAX 255
25
-
#define BTRFS_PATH_NAME_MAX 3072
25
+
#define BTRFS_PATH_NAME_MAX 4087
26
26
27
+
/* this should be 4k */
27
28
struct btrfs_ioctl_vol_args {
28
29
__s64 fd;
29
30
char name[BTRFS_PATH_NAME_MAX + 1];
31
+
};
32
+
33
+
struct btrfs_ioctl_clone_range_args {
34
+
__s64 src_fd;
35
+
__u64 src_offset, src_length;
36
+
__u64 dest_offset;
30
37
};
31
38
32
39
#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
···
59
52
struct btrfs_ioctl_vol_args)
60
53
#define BTRFS_IOC_BALANCE _IOW(BTRFS_IOCTL_MAGIC, 12, \
61
54
struct btrfs_ioctl_vol_args)
62
-
struct btrfs_ioctl_clone_range_args {
63
-
__s64 src_fd;
64
-
__u64 src_offset, src_length;
65
-
__u64 dest_offset;
66
-
};
67
55
68
56
#define BTRFS_IOC_CLONE_RANGE _IOW(BTRFS_IOCTL_MAGIC, 13, \
69
57
struct btrfs_ioctl_clone_range_args)
+2
-1
fs/btrfs/super.c
+2
-1
fs/btrfs/super.c
···
582
582
{
583
583
struct btrfs_ioctl_vol_args *vol;
584
584
struct btrfs_fs_devices *fs_devices;
585
-
int ret = 0;
585
+
int ret = -ENOTTY;
586
586
int len;
587
587
588
588
if (!capable(CAP_SYS_ADMIN))
···
594
594
goto out;
595
595
}
596
596
len = strnlen(vol->name, BTRFS_PATH_NAME_MAX);
597
+
597
598
switch (cmd) {
598
599
case BTRFS_IOC_SCAN_DEV:
599
600
ret = btrfs_scan_one_device(vol->name, FMODE_READ,