Btrfs: add send_stream_version attribute to sysfs
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 6/6 Btrfs: add send_stream_version attribute to sysfs
So that applications can find out what's the highest send stream version supported/implemented by the running kernel:
$ cat /sys/fs/btrfs/send_stream_version
2--- fs/btrfs/send.h | 1 + fs/btrfs/sysfs.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+)
fs/btrfs/send.h +1 -0
@@ -22,6 +22,7 @@#define BTRFS_SEND_STREAM_MAGIC "btrfs-stream"#define BTRFS_SEND_STREAM_VERSION_1 1#define BTRFS_SEND_STREAM_VERSION_2 2 +#define BTRFS_SEND_STREAM_VERSION_LATEST BTRFS_SEND_STREAM_VERSION_2#define BTRFS_SEND_BUF_SIZE (1024 * 64)#define BTRFS_SEND_READ_SIZE (1024 * 48)
fs/btrfs/sysfs.c +36 -0
@@ -31,6 +31,7 @@#include "transaction.h" #include "sysfs.h" #include "volumes.h" +#include "send.h" static inline struct btrfs_fs_info *to_fs_info (struct kobject *kobj);
@@ -662,6 +663,36 @@ static int btrfs_init_debugfs(void)return 0 ; } +static ssize_t send_stream_version_show (struct kobject *kobj, +struct kobj_attribute *a, +char *buf) +{ +return snprintf (buf,PAGE_SIZE ,"%d\n" , +BTRFS_SEND_STREAM_VERSION_LATEST ); +} + +BTRFS_ATTR (send_stream_version,0444 , send_stream_version_show); + +static const struct attribute *btrfs_root_attrs[] = { +BTRFS_ATTR_PTR (send_stream_version), +NULL +}; + +static int add_root_attrs (struct kobject *kobj) +{ +int error =0 ; +int i; + +for (i =0 ; btrfs_root_attrs[i]; i++) { +const struct attribute *a = btrfs_root_attrs[i]; + + error =sysfs_add_file_to_group (kobj->parent, a, kobj->name); +if (error) +break ; + } +return error; +} +int btrfs_init_sysfs (void ) {int ret;
@@ -678,8 +709,13 @@ int btrfs_init_sysfs(void) ret =sysfs_create_group (&btrfs_kset->kobj, &btrfs_feature_attr_group);if (ret) goto out2; + ret =add_root_attrs (&btrfs_kset->kobj); +if (ret) + goto out3;return 0 ; +out3: +sysfs_remove_group (&btrfs_kset->kobj, &btrfs_feature_attr_group); out2:debugfs_remove_recursive (btrfs_debugfs_root_dentry); out1:
Signature · 1 line
1.9.1
PATCH v2 6/6 Btrfs: add send_stream_version attribute to sysfs
So that applications can find out what's the highest send stream version supported/implemented by the running kernel:
$ cat /sys/fs/btrfs/send/stream_version
2---
V2: Renamed /sys/fs/btrfs/send_stream_version to /sys/fs/btrfs/send/stream_version,
as in the future it might be useful to add other sysfs attrbutes related to send (other ro information or tunables like internal buffer sizes, etc).
fs/btrfs/send.h | 1 + fs/btrfs/sysfs.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+)
fs/btrfs/send.h +1 -0
@@ -22,6 +22,7 @@#define BTRFS_SEND_STREAM_MAGIC "btrfs-stream"#define BTRFS_SEND_STREAM_VERSION_1 1#define BTRFS_SEND_STREAM_VERSION_2 2 +#define BTRFS_SEND_STREAM_VERSION_LATEST BTRFS_SEND_STREAM_VERSION_2#define BTRFS_SEND_BUF_SIZE (1024 * 64)#define BTRFS_SEND_READ_SIZE (1024 * 48)
fs/btrfs/sysfs.c +27 -0
@@ -31,6 +31,7 @@#include "transaction.h" #include "sysfs.h" #include "volumes.h" +#include "send.h" static inline struct btrfs_fs_info *to_fs_info (struct kobject *kobj);
@@ -662,6 +663,26 @@ static int btrfs_init_debugfs(void)return 0 ; } +static ssize_t send_stream_version_show (struct kobject *kobj, +struct kobj_attribute *a, +char *buf) +{ +return snprintf (buf,PAGE_SIZE ,"%d\n" , +BTRFS_SEND_STREAM_VERSION_LATEST ); +} + +BTRFS_ATTR (stream_version,0444 , send_stream_version_show); + +static struct attribute *btrfs_send_attrs[] = { +BTRFS_ATTR_PTR (stream_version), +NULL +}; + +static const struct attribute_group btrfs_send_attr_group = { + .name ="send" , + .attrs = btrfs_send_attrs, +}; +int btrfs_init_sysfs (void ) {int ret;
@@ -678,8 +699,13 @@ int btrfs_init_sysfs(void) ret =sysfs_create_group (&btrfs_kset->kobj, &btrfs_feature_attr_group);if (ret) goto out2; + ret =sysfs_create_group (&btrfs_kset->kobj, &btrfs_send_attr_group); +if (ret) + goto out3;return 0 ; +out3: +sysfs_remove_group (&btrfs_kset->kobj, &btrfs_feature_attr_group); out2:debugfs_remove_recursive (btrfs_debugfs_root_dentry); out1:
@@ -691,6 +717,7 @@ out1:void btrfs_exit_sysfs (void ) {sysfs_remove_group (&btrfs_kset->kobj, &btrfs_feature_attr_group); +sysfs_remove_group (&btrfs_kset->kobj, &btrfs_send_attr_group);kset_unregister (btrfs_kset);debugfs_remove_recursive (btrfs_debugfs_root_dentry); }
Signature · 1 line
1.9.1
Quoted 6 lines · Filipe David Borba Manana
So that applications can find out what's the highest send stream version supported/implemented by the running kernel:
$ cat /sys/fs/btrfs/send/stream_version 2
Quoted 6 lines
Signed-off-by Filipe David Borba Manana <[email protected]>---
V2: Renamed
/sys/fs/btrfs/send_stream_versionto/sys/fs/btrfs/send/stream_version,
as in the future it might be useful to add other sysfs attrbutes related to send (other ro information or tunables like internal buffer sizes, etc).
Sounds good, I don't see any issue with the separate directory. Mixing it with /sys/fs/btrfs/features does not seem suitable for that if you intend adding more entries.
Quoted 10 lines · David Sterba
Quoted 9 lines · Filipe David Borba Manana
So that applications can find out what's the highest send stream version supported/implemented by the running kernel:
$ cat /sys/fs/btrfs/send/stream_version 2Signed-off-by Filipe David Borba Manana <[email protected]>---
Quoted 7 lines
Quoted 3 lines
V2: Renamed
/sys/fs/btrfs/send_stream_versionto/sys/fs/btrfs/send/stream_version,
as in the future it might be useful to add other sysfs attrbutes related to send (other ro information or tunables like internal buffer sizes, etc).Sounds good, I don't see any issue with the separate directory. Mixing it with
/sys/fs/btrfs/featuresdoes not seem suitable for that if you intend adding more entries.
Yeah, I only didn't mix it with the features subdir because that relates to features that are settable, plus there's 2 versions of it, one global and one per fs (uuid) subdirectory (and it felt odd to me to add it to one of those subdirs and not the other).
Thanks David
Quoted 2 lines
Reviewed-by David Sterba <[email protected]>
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
PATCH v5 6/6 Btrfs: add send_stream_version attribute to sysfs
In reply to Filipe David Borba MananaSo that applications can find out what's the highest send stream version supported/implemented by the running kernel:
$ cat /sys/fs/btrfs/send/stream_version
2---
V1..V4: There's no v1, v2, v3 and v4. Bumped directly to v5 to make all patches
in the series have the same version.
V5: Rebased against latest chris/integration branch.
fs/btrfs/send.h | 1 + fs/btrfs/sysfs.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+)
fs/btrfs/send.h +1 -0
@@ -22,6 +22,7 @@#define BTRFS_SEND_STREAM_MAGIC "btrfs-stream"#define BTRFS_SEND_STREAM_VERSION_1 1#define BTRFS_SEND_STREAM_VERSION_2 2 +#define BTRFS_SEND_STREAM_VERSION_LATEST BTRFS_SEND_STREAM_VERSION_2#define BTRFS_SEND_BUF_SIZE (1024 * 64)#define BTRFS_SEND_READ_SIZE (1024 * 48)
fs/btrfs/sysfs.c +27 -0
@@ -31,6 +31,7 @@#include "transaction.h" #include "sysfs.h" #include "volumes.h" +#include "send.h" static inline struct btrfs_fs_info *to_fs_info (struct kobject *kobj);
@@ -700,6 +701,26 @@ static int btrfs_init_debugfs(void)return 0 ; } +static ssize_t send_stream_version_show (struct kobject *kobj, +struct kobj_attribute *a, +char *buf) +{ +return snprintf (buf,PAGE_SIZE ,"%d\n" , +BTRFS_SEND_STREAM_VERSION_LATEST ); +} + +BTRFS_ATTR (stream_version,0444 , send_stream_version_show); + +static struct attribute *btrfs_send_attrs[] = { +BTRFS_ATTR_PTR (stream_version), +NULL +}; + +static const struct attribute_group btrfs_send_attr_group = { + .name ="send" , + .attrs = btrfs_send_attrs, +}; +int btrfs_init_sysfs (void ) {int ret;
@@ -716,8 +737,13 @@ int btrfs_init_sysfs(void) ret =sysfs_create_group (&btrfs_kset->kobj, &btrfs_feature_attr_group);if (ret) goto out2; + ret =sysfs_create_group (&btrfs_kset->kobj, &btrfs_send_attr_group); +if (ret) + goto out3;return 0 ; +out3: +sysfs_remove_group (&btrfs_kset->kobj, &btrfs_feature_attr_group); out2:debugfs_remove_recursive (btrfs_debugfs_root_dentry); out1:
@@ -729,6 +755,7 @@ out1:void btrfs_exit_sysfs (void ) {sysfs_remove_group (&btrfs_kset->kobj, &btrfs_feature_attr_group); +sysfs_remove_group (&btrfs_kset->kobj, &btrfs_send_attr_group);kset_unregister (btrfs_kset);debugfs_remove_recursive (btrfs_debugfs_root_dentry); }
Signature · 1 line
1.9.1