public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysfs: explicitly pass size to sysfs_add_bin_file_mode_ns()

Browse source 
Upcoming changes to the sysfs core require the size of the created file
to be overridable by the caller.
Add a parameter to enable this.
For now keep using attr->size in all cases.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Krzysztof Wilczyński <kw@linux.com>
Link: https://lore.kernel.org/r/20241103-sysfs-const-bin_attr-v2-1-71110628844c@weissschuh.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Thomas Weißschuh 2024-11-03 17:03:30 +00:00 • committed by Greg Kroah-Hartman
parent 09fbb82f94
commit 0afcee132b
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/sysfs/file.c
View file

@ -315,7 +315,7 @@ int sysfs_add_file_mode_ns(struct kernfs_node *parent,
} }
int sysfs_add_bin_file_mode_ns(struct kernfs_node *parent, int sysfs_add_bin_file_mode_ns(struct kernfs_node *parent,
const struct bin_attribute *battr, umode_t mode, const struct bin_attribute *battr, umode_t mode, size_t size,
kuid_t uid, kgid_t gid, const void *ns) kuid_t uid, kgid_t gid, const void *ns)
{ {
const struct attribute *attr = &battr->attr; const struct attribute *attr = &battr->attr;
@ -340,7 +340,7 @@ int sysfs_add_bin_file_mode_ns(struct kernfs_node *parent,
#endif #endif
kn = __kernfs_create_file(parent, attr->name, mode & 0777, uid, gid, kn = __kernfs_create_file(parent, attr->name, mode & 0777, uid, gid,
battr->size, ops, (void *)attr, ns, key); size, ops, (void *)attr, ns, key);
if (IS_ERR(kn)) { if (IS_ERR(kn)) {
if (PTR_ERR(kn) == -EEXIST) if (PTR_ERR(kn) == -EEXIST)
sysfs_warn_dup(parent, attr->name); sysfs_warn_dup(parent, attr->name);
@ -580,8 +580,8 @@ int sysfs_create_bin_file(struct kobject *kobj,
return -EINVAL; return -EINVAL;
kobject_get_ownership(kobj, &uid, &gid); kobject_get_ownership(kobj, &uid, &gid);
return sysfs_add_bin_file_mode_ns(kobj->sd, attr, attr->attr.mode, uid, return sysfs_add_bin_file_mode_ns(kobj->sd, attr, attr->attr.mode,
gid, NULL); attr->size, uid, gid, NULL);
} }
EXPORT_SYMBOL_GPL(sysfs_create_bin_file); EXPORT_SYMBOL_GPL(sysfs_create_bin_file);

3
fs/sysfs/group.c
View file

@ -87,6 +87,7 @@ static int create_files(struct kernfs_node *parent, struct kobject *kobj,
if (grp->bin_attrs) { if (grp->bin_attrs) {
for (i = 0, bin_attr = grp->bin_attrs; *bin_attr; i++, bin_attr++) { for (i = 0, bin_attr = grp->bin_attrs; *bin_attr; i++, bin_attr++) {
umode_t mode = (*bin_attr)->attr.mode; umode_t mode = (*bin_attr)->attr.mode;
size_t size = (*bin_attr)->size;
if (update) if (update)
kernfs_remove_by_name(parent, kernfs_remove_by_name(parent,
@ -104,7 +105,7 @@ static int create_files(struct kernfs_node *parent, struct kobject *kobj,
mode &= SYSFS_PREALLOC | 0664; mode &= SYSFS_PREALLOC | 0664;
error = sysfs_add_bin_file_mode_ns(parent, *bin_attr, error = sysfs_add_bin_file_mode_ns(parent, *bin_attr,
mode, uid, gid, mode, size, uid, gid,
NULL); NULL);
if (error) if (error)
break; break;

2
fs/sysfs/sysfs.h
View file

@ -31,7 +31,7 @@ int sysfs_add_file_mode_ns(struct kernfs_node *parent,
const struct attribute *attr, umode_t amode, kuid_t uid, const struct attribute *attr, umode_t amode, kuid_t uid,
kgid_t gid, const void *ns); kgid_t gid, const void *ns);
int sysfs_add_bin_file_mode_ns(struct kernfs_node *parent, int sysfs_add_bin_file_mode_ns(struct kernfs_node *parent,
const struct bin_attribute *battr, umode_t mode, const struct bin_attribute *battr, umode_t mode, size_t size,
kuid_t uid, kgid_t gid, const void *ns); kuid_t uid, kgid_t gid, const void *ns);
/* /*