diff options
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 | ||||
| -rw-r--r-- | include/uapi/linux/btrfs.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 2f6d7b13b5bd..c6c8e3560e73 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
| @@ -2574,6 +2574,10 @@ static long btrfs_ioctl_fs_info(struct btrfs_root *root, void __user *arg) | |||
| 2574 | } | 2574 | } |
| 2575 | mutex_unlock(&fs_devices->device_list_mutex); | 2575 | mutex_unlock(&fs_devices->device_list_mutex); |
| 2576 | 2576 | ||
| 2577 | fi_args->nodesize = root->fs_info->super_copy->nodesize; | ||
| 2578 | fi_args->sectorsize = root->fs_info->super_copy->sectorsize; | ||
| 2579 | fi_args->clone_alignment = root->fs_info->super_copy->sectorsize; | ||
| 2580 | |||
| 2577 | if (copy_to_user(arg, fi_args, sizeof(*fi_args))) | 2581 | if (copy_to_user(arg, fi_args, sizeof(*fi_args))) |
| 2578 | ret = -EFAULT; | 2582 | ret = -EFAULT; |
| 2579 | 2583 | ||
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 901a3c563f60..7554fd381a56 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h | |||
| @@ -181,7 +181,11 @@ struct btrfs_ioctl_fs_info_args { | |||
| 181 | __u64 max_id; /* out */ | 181 | __u64 max_id; /* out */ |
| 182 | __u64 num_devices; /* out */ | 182 | __u64 num_devices; /* out */ |
| 183 | __u8 fsid[BTRFS_FSID_SIZE]; /* out */ | 183 | __u8 fsid[BTRFS_FSID_SIZE]; /* out */ |
| 184 | __u64 reserved[124]; /* pad to 1k */ | 184 | __u32 nodesize; /* out */ |
| 185 | __u32 sectorsize; /* out */ | ||
| 186 | __u32 clone_alignment; /* out */ | ||
| 187 | __u32 reserved32; | ||
| 188 | __u64 reserved[122]; /* pad to 1k */ | ||
| 185 | }; | 189 | }; |
| 186 | 190 | ||
| 187 | struct btrfs_ioctl_feature_flags { | 191 | struct btrfs_ioctl_feature_flags { |
