[PATCH v2 2/6] module: sysfs: Drop member 'module_sect_attr::address'

[Thomas Weißschuh]

'struct bin_attribute' already contains the member 'private' to pass
custom data to the attribute handlers.
Use that instead of the custom 'address' member.

Signed-off-by: Thomas Weißschuh <li...@weissschuh.net>
---
 kernel/module/sysfs.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/kernel/module/sysfs.c b/kernel/module/sysfs.c
index 
b7841f76a933114e6dbd0fc2d32a60b66b7966b6..8955b3da1b499881256670418d41c5d52d9e5a5e
 100644
--- a/kernel/module/sysfs.c
+++ b/kernel/module/sysfs.c
@@ -21,7 +21,6 @@
 #ifdef CONFIG_KALLSYMS
 struct module_sect_attr {
        struct bin_attribute battr;
-       unsigned long address;
 };
 
 struct module_sect_attrs {
@@ -34,8 +33,6 @@ static ssize_t module_sect_read(struct file *file, struct 
kobject *kobj,
                                struct bin_attribute *battr,
                                char *buf, loff_t pos, size_t count)
 {
-       struct module_sect_attr *sattr =
-               container_of(battr, struct module_sect_attr, battr);
        char bounce[MODULE_SECT_READ_SIZE + 1];
        size_t wrote;
 
@@ -52,7 +49,7 @@ static ssize_t module_sect_read(struct file *file, struct 
kobject *kobj,
         */
        wrote = scnprintf(bounce, sizeof(bounce), "0x%px\n",
                          kallsyms_show_value(file->f_cred)
-                               ? (void *)sattr->address : NULL);
+                               ? battr->private : NULL);
        count = min(count, wrote);
        memcpy(buf, bounce, count);
 
@@ -99,7 +96,6 @@ static int add_sect_attrs(struct module *mod, const struct 
load_info *info)
                if (sect_empty(sec))
                        continue;
                sysfs_bin_attr_init(&sattr->battr);
-               sattr->address = sec->sh_addr;
                sattr->battr.attr.name =
                        kstrdup(info->secstrings + sec->sh_name, GFP_KERNEL);
                if (!sattr->battr.attr.name) {
@@ -107,6 +103,7 @@ static int add_sect_attrs(struct module *mod, const struct 
load_info *info)
                        goto out;
                }
                sattr->battr.read = module_sect_read;
+               sattr->battr.private = (void *)sec->sh_addr;
                sattr->battr.size = MODULE_SECT_READ_SIZE;
                sattr->battr.attr.mode = 0400;
                *(gattr++) = &(sattr++)->battr;

-- 
2.47.1