From: "Thomas Weißschuh" <linux@weissschuh.net>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Danilo Krummrich <dakr@kernel.org>
Cc: linux-kernel@vger.kernel.org, "Thomas Weißschuh" <linux@weissschuh.net>
Subject: [PATCH v2 5/6] sysfs: remove bin_attribute::read_new/write_new()
Date: Thu, 13 Mar 2025 16:57:49 +0100 [thread overview]
Message-ID: <20250313-sysfs-const-bin_attr-final-v2-5-96284e1e88ce@weissschuh.net> (raw)
In-Reply-To: <20250313-sysfs-const-bin_attr-final-v2-0-96284e1e88ce@weissschuh.net>
These transitional fields are unnecessary und unused.
Remove them and their logic in the sysfs core.
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
fs/sysfs/file.c | 22 +++++-----------------
include/linux/sysfs.h | 4 ----
2 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index c3d3b079aedde7ca5318328fe853ccf891d663e9..05b61c701a377ea2644d19c1b89491a49b69da63 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -97,12 +97,9 @@ static ssize_t sysfs_kf_bin_read(struct kernfs_open_file *of, char *buf,
count = size - pos;
}
- if (!battr->read && !battr->read_new)
+ if (!battr->read)
return -EIO;
- if (battr->read_new)
- return battr->read_new(of->file, kobj, battr, buf, pos, count);
-
return battr->read(of->file, kobj, battr, buf, pos, count);
}
@@ -161,12 +158,9 @@ static ssize_t sysfs_kf_bin_write(struct kernfs_open_file *of, char *buf,
if (!count)
return 0;
- if (!battr->write && !battr->write_new)
+ if (!battr->write)
return -EIO;
- if (battr->write_new)
- return battr->write_new(of->file, kobj, battr, buf, pos, count);
-
return battr->write(of->file, kobj, battr, buf, pos, count);
}
@@ -335,19 +329,13 @@ int sysfs_add_bin_file_mode_ns(struct kernfs_node *parent,
const struct kernfs_ops *ops;
struct kernfs_node *kn;
- if (battr->read && battr->read_new)
- return -EINVAL;
-
- if (battr->write && battr->write_new)
- return -EINVAL;
-
if (battr->mmap)
ops = &sysfs_bin_kfops_mmap;
- else if ((battr->read || battr->read_new) && (battr->write || battr->write_new))
+ else if (battr->read && battr->write)
ops = &sysfs_bin_kfops_rw;
- else if (battr->read || battr->read_new)
+ else if (battr->read)
ops = &sysfs_bin_kfops_ro;
- else if (battr->write || battr->write_new)
+ else if (battr->write)
ops = &sysfs_bin_kfops_wo;
else
ops = &sysfs_file_kfops_empty;
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index f418aae4f1134f8126783d9e8eb575ba4278e927..7544f6d81c05982b5d168624f376cd647127ab51 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -308,12 +308,8 @@ struct bin_attribute {
struct address_space *(*f_mapping)(void);
ssize_t (*read)(struct file *, struct kobject *, const struct bin_attribute *,
char *, loff_t, size_t);
- ssize_t (*read_new)(struct file *, struct kobject *, const struct bin_attribute *,
- char *, loff_t, size_t);
ssize_t (*write)(struct file *, struct kobject *, const struct bin_attribute *,
char *, loff_t, size_t);
- ssize_t (*write_new)(struct file *, struct kobject *,
- const struct bin_attribute *, char *, loff_t, size_t);
loff_t (*llseek)(struct file *, struct kobject *, const struct bin_attribute *,
loff_t, int);
int (*mmap)(struct file *, struct kobject *, const struct bin_attribute *attr,
--
2.48.1
next prev parent reply other threads:[~2025-03-13 15:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 15:57 [PATCH v2 0/6] sysfs: finalize the constification of 'struct bin_attribute' Thomas Weißschuh
2025-03-13 15:57 ` [PATCH v2 1/6] sysfs: constify bin_attribute argument of bin_attribute::read/write() Thomas Weißschuh
2025-03-13 15:57 ` [PATCH v2 2/6] sysfs: constify attribute_group::bin_attrs Thomas Weißschuh
2025-03-13 15:57 ` [PATCH v2 3/6] sysfs: treewide: switch back to bin_attribute::read()/write() Thomas Weißschuh
2025-03-13 15:57 ` [PATCH v2 4/6] sysfs: treewide: switch back to attribute_group::bin_attrs Thomas Weißschuh
2025-03-13 15:57 ` Thomas Weißschuh [this message]
2025-03-13 15:57 ` [PATCH v2 6/6] sysfs: remove attribute_group::bin_attrs_new Thomas Weißschuh
2025-04-15 16:48 ` [PATCH v2 0/6] sysfs: finalize the constification of 'struct bin_attribute' Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250313-sysfs-const-bin_attr-final-v2-5-96284e1e88ce@weissschuh.net \
--to=linux@weissschuh.net \
--cc=dakr@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®