openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on module dynamic attributes 

A little more whack-a-mole annotating the dynamic sysfs attributes.  I
had everything built into my earlier test kernel, and so I missed
these.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Eric W. Biederman 2010-02-12 13:41:56 -08:00 committed by Greg Kroah-Hartman
parent 35960258ed
commit 361795b1eb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/module.c
View File

@ -1085,6 +1085,7 @@ static void add_sect_attrs(struct module *mod, unsigned int nsect,
if (sattr->name == NULL) if (sattr->name == NULL)
goto out; goto out;
sect_attrs->nsections++; sect_attrs->nsections++;
sysfs_attr_init(&sattr->mattr.attr);
sattr->mattr.show = module_sect_show; sattr->mattr.show = module_sect_show;
sattr->mattr.store = NULL; sattr->mattr.store = NULL;
sattr->mattr.attr.name = sattr->name; sattr->mattr.attr.name = sattr->name;
@ -1180,6 +1181,7 @@ static void add_notes_attrs(struct module *mod, unsigned int nsect,
if (sect_empty(&sechdrs[i])) if (sect_empty(&sechdrs[i]))
continue; continue;
if (sechdrs[i].sh_type == SHT_NOTE) { if (sechdrs[i].sh_type == SHT_NOTE) {
sysfs_bin_attr_init(nattr);
nattr->attr.name = mod->sect_attrs->attrs[loaded].name; nattr->attr.name = mod->sect_attrs->attrs[loaded].name;
nattr->attr.mode = S_IRUGO; nattr->attr.mode = S_IRUGO;
nattr->size = sechdrs[i].sh_size; nattr->size = sechdrs[i].sh_size;
@ -1252,6 +1254,7 @@ int module_add_modinfo_attrs(struct module *mod)
if (!attr->test || if (!attr->test ||
(attr->test && attr->test(mod))) { (attr->test && attr->test(mod))) {
memcpy(temp_attr, attr, sizeof(*temp_attr)); memcpy(temp_attr, attr, sizeof(*temp_attr));
sysfs_attr_init(&temp_attr->attr);
error = sysfs_create_file(&mod->mkobj.kobj,&temp_attr->attr); error = sysfs_create_file(&mod->mkobj.kobj,&temp_attr->attr);
++temp_attr; ++temp_attr;
} }