From: Rong Tao rongtao@cestc.cn
Since commit 97d06802d10a ("sysfs: constify bin_attribute argument of bin_attribute::read/write()"), make bin_attribute parameter of bin_attribute::read/write() const.
Signed-off-by: Rong Tao rongtao@cestc.cn --- tools/testing/selftests/bpf/test_kmods/bpf_testmod.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c index e6c248e3ae54..e9e918cdf31f 100644 --- a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +++ b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c @@ -385,7 +385,7 @@ int bpf_testmod_fentry_ok;
noinline ssize_t bpf_testmod_test_read(struct file *file, struct kobject *kobj, - struct bin_attribute *bin_attr, + const struct bin_attribute *bin_attr, char *buf, loff_t off, size_t len) { struct bpf_testmod_test_read_ctx ctx = { @@ -465,7 +465,7 @@ ALLOW_ERROR_INJECTION(bpf_testmod_test_read, ERRNO);
noinline ssize_t bpf_testmod_test_write(struct file *file, struct kobject *kobj, - struct bin_attribute *bin_attr, + const struct bin_attribute *bin_attr, char *buf, loff_t off, size_t len) { struct bpf_testmod_test_write_ctx ctx = { @@ -567,7 +567,7 @@ static void testmod_unregister_uprobe(void)
static ssize_t bpf_testmod_uprobe_write(struct file *file, struct kobject *kobj, - struct bin_attribute *bin_attr, + const struct bin_attribute *bin_attr, char *buf, loff_t off, size_t len) { unsigned long offset = 0;
On Wed, Jun 04, 2025 at 01:53:22PM +0800, Rong Tao wrote:
From: Rong Tao rongtao@cestc.cn
Since commit 97d06802d10a ("sysfs: constify bin_attribute argument of bin_attribute::read/write()"), make bin_attribute parameter of bin_attribute::read/write() const.
hi, there's already fix for this in bpf/master
thanks, jirka
Signed-off-by: Rong Tao rongtao@cestc.cn
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c index e6c248e3ae54..e9e918cdf31f 100644 --- a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +++ b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c @@ -385,7 +385,7 @@ int bpf_testmod_fentry_ok; noinline ssize_t bpf_testmod_test_read(struct file *file, struct kobject *kobj,
struct bin_attribute *bin_attr,
const struct bin_attribute *bin_attr, char *buf, loff_t off, size_t len){ struct bpf_testmod_test_read_ctx ctx = { @@ -465,7 +465,7 @@ ALLOW_ERROR_INJECTION(bpf_testmod_test_read, ERRNO); noinline ssize_t bpf_testmod_test_write(struct file *file, struct kobject *kobj,
struct bin_attribute *bin_attr,
const struct bin_attribute *bin_attr, char *buf, loff_t off, size_t len){ struct bpf_testmod_test_write_ctx ctx = { @@ -567,7 +567,7 @@ static void testmod_unregister_uprobe(void) static ssize_t bpf_testmod_uprobe_write(struct file *file, struct kobject *kobj,
struct bin_attribute *bin_attr,
const struct bin_attribute *bin_attr, char *buf, loff_t off, size_t len){ unsigned long offset = 0; -- 2.49.0
On 6/4/25 16:53, Jiri Olsa wrote:
On Wed, Jun 04, 2025 at 01:53:22PM +0800, Rong Tao wrote:
From: Rong Tao rongtao@cestc.cn
Since commit 97d06802d10a ("sysfs: constify bin_attribute argument of bin_attribute::read/write()"), make bin_attribute parameter of bin_attribute::read/write() const.
hi, there's already fix for this in bpf/master
thanks, jirka
I am confused, when should I use bpf/master[2] and when should I use bpf-next/master[1]? thank you :)
[1] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git [2] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov ast@kernel.org:
On Wed, 4 Jun 2025 13:53:22 +0800 you wrote:
From: Rong Tao rongtao@cestc.cn
Since commit 97d06802d10a ("sysfs: constify bin_attribute argument of bin_attribute::read/write()"), make bin_attribute parameter of bin_attribute::read/write() const.
Signed-off-by: Rong Tao rongtao@cestc.cn
[...]
Here is the summary with links: - [bpf-next] selftests/bpf: Fix compile error of bin_attribute::read/write() https://git.kernel.org/bpf/bpf-next/c/4b65d5ae9714
You are awesome, thank you!
linux-kselftest-mirror@lists.linaro.org
-
Jiri Olsa -
patchwork-bot+netdevbpf＠kernel.org -
Rong Tao