btrfs: retrieve more info from FS_INFO ioctl

kdave · masoncl · commit 80a773fbfc2d · 2014-06-09T17:20:27.000-07:00
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 &lt;dsterba@suse.cz&gt;
Signed-off-by: Chris Mason &lt;clm@fb.com&gt;
diff --git 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)
 	}
 	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;
 
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -2574,6 +2574,10 @@ static long btrfs_ioctl_fs_info(struct btrfs_root root, void __user arg)`
`2574`	`2574`	`}`
`2575`	`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`	`2581`	`if (copy_to_user(arg, fi_args, sizeof(*fi_args)))`
`2578`	`2582`	`ret = -EFAULT;`
`2579`	`2583`