Skip to content

Commit

Permalink
btrfs: retrieve more info from FS_INFO ioctl
Browse files Browse the repository at this point in the history
Provide the basic information about filesystem through the ioctl:
* b-tree node size (same as leaf size)
* sector size
* expected alignment of CLONE_RANGE and EXTENT_SAME ioctl arguments

Backward compatibility: if the values are 0, kernel does not provide
this information, the applications should ignore them.

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
  • Loading branch information
David Sterba authored and Chris Mason committed Jun 10, 2014
1 parent 7d824b6 commit 80a773f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions fs/btrfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2574,6 +2574,10 @@ static long btrfs_ioctl_fs_info(struct btrfs_root *root, void __user *arg)
}
mutex_unlock(&fs_devices->device_list_mutex);

fi_args->nodesize = root->fs_info->super_copy->nodesize;
fi_args->sectorsize = root->fs_info->super_copy->sectorsize;
fi_args->clone_alignment = root->fs_info->super_copy->sectorsize;

if (copy_to_user(arg, fi_args, sizeof(*fi_args)))
ret = -EFAULT;

Expand Down
6 changes: 5 additions & 1 deletion include/uapi/linux/btrfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,11 @@ struct btrfs_ioctl_fs_info_args {
__u64 max_id; /* out */
__u64 num_devices; /* out */
__u8 fsid[BTRFS_FSID_SIZE]; /* out */
__u64 reserved[124]; /* pad to 1k */
__u32 nodesize; /* out */
__u32 sectorsize; /* out */
__u32 clone_alignment; /* out */
__u32 reserved32;
__u64 reserved[122]; /* pad to 1k */
};

struct btrfs_ioctl_feature_flags {
Expand Down

0 comments on commit 80a773f

Please sign in to comment.