From: Thomas Weißschuh Date: Sat, 28 Dec 2024 08:43:43 +0000 (+0100) Subject: btf: Switch module BTF attribute to sysfs_bin_attr_simple_read() X-Git-Tag: v6.14-rc1~55^2~45 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18032c6bc0e204c8f836b09707ef671991e4fe87;p=thirdparty%2Flinux.git btf: Switch module BTF attribute to sysfs_bin_attr_simple_read() The generic function from the sysfs core can replace the custom one. Signed-off-by: Thomas Weißschuh Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/r/20241228-sysfs-const-bin_attr-simple-v2-3-7c6f3f1767a3@weissschuh.net Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index e5a5f023cedd5..76de36d255200 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -8011,17 +8011,6 @@ struct btf_module { static LIST_HEAD(btf_modules); static DEFINE_MUTEX(btf_module_mutex); -static ssize_t -btf_module_read(struct file *file, struct kobject *kobj, - struct bin_attribute *bin_attr, - char *buf, loff_t off, size_t len) -{ - const struct btf *btf = bin_attr->private; - - memcpy(buf, btf->data + off, len); - return len; -} - static void purge_cand_cache(struct btf *btf); static int btf_module_notify(struct notifier_block *nb, unsigned long op, @@ -8082,8 +8071,8 @@ static int btf_module_notify(struct notifier_block *nb, unsigned long op, attr->attr.name = btf->name; attr->attr.mode = 0444; attr->size = btf->data_size; - attr->private = btf; - attr->read = btf_module_read; + attr->private = btf->data; + attr->read_new = sysfs_bin_attr_simple_read; err = sysfs_create_bin_file(btf_kobj, attr); if (err) {