iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysfs: fix placement of EXPORT_SYMBOL()

Browse Source 
The export should happen after the function, not at the bottom of the
file, so fix that up.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-08-21 16:17:47 -07:00
parent 9e2a47ed64
commit 1b866757fc
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/sysfs/bin.c
View File

@ -481,7 +481,6 @@ void unmap_bin_file(struct sysfs_dirent *attr_sd)
* @kobj: object. * @kobj: object.
* @attr: attribute descriptor. * @attr: attribute descriptor.
*/ */
int sysfs_create_bin_file(struct kobject *kobj, int sysfs_create_bin_file(struct kobject *kobj,
const struct bin_attribute *attr) const struct bin_attribute *attr)
{ {
@ -489,19 +488,16 @@ int sysfs_create_bin_file(struct kobject *kobj,
return sysfs_add_file(kobj->sd, &attr->attr, SYSFS_KOBJ_BIN_ATTR); return sysfs_add_file(kobj->sd, &attr->attr, SYSFS_KOBJ_BIN_ATTR);
} }
EXPORT_SYMBOL_GPL(sysfs_create_bin_file);
/** /**
* sysfs_remove_bin_file - remove binary file for object. * sysfs_remove_bin_file - remove binary file for object.
* @kobj: object. * @kobj: object.
* @attr: attribute descriptor. * @attr: attribute descriptor.
*/ */
void sysfs_remove_bin_file(struct kobject *kobj, void sysfs_remove_bin_file(struct kobject *kobj,
const struct bin_attribute *attr) const struct bin_attribute *attr)
{ {
sysfs_hash_and_remove(kobj->sd, NULL, attr->attr.name); sysfs_hash_and_remove(kobj->sd, NULL, attr->attr.name);
} }
EXPORT_SYMBOL_GPL(sysfs_create_bin_file);
EXPORT_SYMBOL_GPL(sysfs_remove_bin_file); EXPORT_SYMBOL_GPL(sysfs_remove_bin_file);

13
fs/sysfs/file.c
View File

@ -569,7 +569,6 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd, const struct attribute *attr,
* @kobj: object we're creating for. * @kobj: object we're creating for.
* @attr: attribute descriptor. * @attr: attribute descriptor.
*/ */
int sysfs_create_file(struct kobject * kobj, const struct attribute * attr) int sysfs_create_file(struct kobject * kobj, const struct attribute * attr)
{ {
BUG_ON(!kobj || !kobj->sd || !attr); BUG_ON(!kobj || !kobj->sd || !attr);
@ -577,6 +576,7 @@ int sysfs_create_file(struct kobject * kobj, const struct attribute * attr)
return sysfs_add_file(kobj->sd, attr, SYSFS_KOBJ_ATTR); return sysfs_add_file(kobj->sd, attr, SYSFS_KOBJ_ATTR);
} }
EXPORT_SYMBOL_GPL(sysfs_create_file);
int sysfs_create_files(struct kobject *kobj, const struct attribute **ptr) int sysfs_create_files(struct kobject *kobj, const struct attribute **ptr)
{ {
@ -590,6 +590,7 @@ int sysfs_create_files(struct kobject *kobj, const struct attribute **ptr)
sysfs_remove_file(kobj, ptr[i]); sysfs_remove_file(kobj, ptr[i]);
return err; return err;
} }
EXPORT_SYMBOL_GPL(sysfs_create_files);
/** /**
* sysfs_add_file_to_group - add an attribute file to a pre-existing group. * sysfs_add_file_to_group - add an attribute file to a pre-existing group.
@ -654,7 +655,6 @@ int sysfs_chmod_file(struct kobject *kobj, const struct attribute *attr,
} }
EXPORT_SYMBOL_GPL(sysfs_chmod_file); EXPORT_SYMBOL_GPL(sysfs_chmod_file);
/** /**
* sysfs_remove_file - remove an object attribute. * sysfs_remove_file - remove an object attribute.
* @kobj: object we're acting for. * @kobj: object we're acting for.
@ -662,7 +662,6 @@ EXPORT_SYMBOL_GPL(sysfs_chmod_file);
* *
* Hash the attribute name and kill the victim. * Hash the attribute name and kill the victim.
*/ */
void sysfs_remove_file(struct kobject * kobj, const struct attribute * attr) void sysfs_remove_file(struct kobject * kobj, const struct attribute * attr)
{ {
const void *ns; const void *ns;
@ -672,6 +671,7 @@ void sysfs_remove_file(struct kobject * kobj, const struct attribute * attr)
sysfs_hash_and_remove(kobj->sd, ns, attr->name); sysfs_hash_and_remove(kobj->sd, ns, attr->name);
} }
EXPORT_SYMBOL_GPL(sysfs_remove_file);
void sysfs_remove_files(struct kobject * kobj, const struct attribute **ptr) void sysfs_remove_files(struct kobject * kobj, const struct attribute **ptr)
{ {
@ -679,6 +679,7 @@ void sysfs_remove_files(struct kobject * kobj, const struct attribute **ptr)
for (i = 0; ptr[i]; i++) for (i = 0; ptr[i]; i++)
sysfs_remove_file(kobj, ptr[i]); sysfs_remove_file(kobj, ptr[i]);
} }
EXPORT_SYMBOL_GPL(sysfs_remove_files);
/** /**
* sysfs_remove_file_from_group - remove an attribute file from a group. * sysfs_remove_file_from_group - remove an attribute file from a group.
@ -793,9 +794,3 @@ int sysfs_schedule_callback(struct kobject *kobj, void (*func)(void *),
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(sysfs_schedule_callback); EXPORT_SYMBOL_GPL(sysfs_schedule_callback);
EXPORT_SYMBOL_GPL(sysfs_create_file);
EXPORT_SYMBOL_GPL(sysfs_remove_file);
EXPORT_SYMBOL_GPL(sysfs_remove_files);
EXPORT_SYMBOL_GPL(sysfs_create_files);

9
fs/sysfs/symlink.c
View File

@ -125,6 +125,7 @@ int sysfs_create_link(struct kobject *kobj, struct kobject *target,
{ {
return sysfs_do_create_link(kobj, target, name, 1); return sysfs_do_create_link(kobj, target, name, 1);
} }
EXPORT_SYMBOL_GPL(sysfs_create_link);
/** /**
* sysfs_create_link_nowarn - create symlink between two objects. * sysfs_create_link_nowarn - create symlink between two objects.
@ -166,7 +167,6 @@ void sysfs_delete_link(struct kobject *kobj, struct kobject *targ,
* @kobj: object we're acting for. * @kobj: object we're acting for.
* @name: name of the symlink to remove. * @name: name of the symlink to remove.
*/ */
void sysfs_remove_link(struct kobject * kobj, const char * name) void sysfs_remove_link(struct kobject * kobj, const char * name)
{ {
struct sysfs_dirent *parent_sd = NULL; struct sysfs_dirent *parent_sd = NULL;
@ -178,6 +178,7 @@ void sysfs_remove_link(struct kobject * kobj, const char * name)
sysfs_hash_and_remove(parent_sd, NULL, name); sysfs_hash_and_remove(parent_sd, NULL, name);
} }
EXPORT_SYMBOL_GPL(sysfs_remove_link);
/** /**
* sysfs_rename_link - rename symlink in object's directory. * sysfs_rename_link - rename symlink in object's directory.
@ -223,6 +224,7 @@ out:
sysfs_put(sd); sysfs_put(sd);
return result; return result;
} }
EXPORT_SYMBOL_GPL(sysfs_rename_link);
static int sysfs_get_target_path(struct sysfs_dirent *parent_sd, static int sysfs_get_target_path(struct sysfs_dirent *parent_sd,
struct sysfs_dirent *target_sd, char *path) struct sysfs_dirent *target_sd, char *path)
@ -319,8 +321,3 @@ const struct inode_operations sysfs_symlink_inode_operations = {
.getattr = sysfs_getattr, .getattr = sysfs_getattr,
.permission = sysfs_permission, .permission = sysfs_permission,
}; };
EXPORT_SYMBOL_GPL(sysfs_create_link);
EXPORT_SYMBOL_GPL(sysfs_remove_link);
EXPORT_SYMBOL_GPL(sysfs_rename_link);