Commit 1b866757 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

sysfs: fix placement of EXPORT_SYMBOL() 



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

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e2a47ed

fs/sysfs/bin.c

+1 −5
Original line number Diff line number Diff line
@@ -481,7 +481,6 @@ void unmap_bin_file(struct sysfs_dirent *attr_sd) 
 *	@kobj:	object.

 *	@attr:	attribute descriptor.

 */



int sysfs_create_bin_file(struct kobject *kobj,

			  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);

}



EXPORT_SYMBOL_GPL(sysfs_create_bin_file);



/**

 *	sysfs_remove_bin_file - remove binary file for object.

 *	@kobj:	object.

 *	@attr:	attribute descriptor.

 */



void sysfs_remove_bin_file(struct kobject *kobj,

			   const struct bin_attribute *attr)

{

	sysfs_hash_and_remove(kobj->sd, NULL, attr->attr.name);

}



EXPORT_SYMBOL_GPL(sysfs_create_bin_file);

EXPORT_SYMBOL_GPL(sysfs_remove_bin_file);

fs/sysfs/file.c

+4 −9
Original line number Diff line number Diff line
@@ -569,7 +569,6 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd, const struct attribute *attr, 
 *	@kobj:	object we're creating for. 

 *	@attr:	attribute descriptor.

 */



int sysfs_create_file(struct kobject * kobj, const struct attribute * 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);



}

EXPORT_SYMBOL_GPL(sysfs_create_file);



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]);

	return err;

}

EXPORT_SYMBOL_GPL(sysfs_create_files);



/**

 * 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);





/**

 *	sysfs_remove_file - remove an object attribute.

 *	@kobj:	object we're acting for.
@@ -662,7 +662,6 @@ EXPORT_SYMBOL_GPL(sysfs_chmod_file); 
 *

 *	Hash the attribute name and kill the victim.

 */



void sysfs_remove_file(struct kobject * kobj, const struct attribute * attr)

{

	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);

}

EXPORT_SYMBOL_GPL(sysfs_remove_file);



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++)

		sysfs_remove_file(kobj, ptr[i]);

}

EXPORT_SYMBOL_GPL(sysfs_remove_files);



/**

 * 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;

}

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);

fs/sysfs/symlink.c

+3 −6
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ int sysfs_create_link(struct kobject *kobj, struct kobject *target, 
{

	return sysfs_do_create_link(kobj, target, name, 1);

}

EXPORT_SYMBOL_GPL(sysfs_create_link);



/**

 *	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.

 *	@name:	name of the symlink to remove.

 */



void sysfs_remove_link(struct kobject * kobj, const char * name)

{

	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);

}

EXPORT_SYMBOL_GPL(sysfs_remove_link);



/**

 *	sysfs_rename_link - rename symlink in object's directory.
@@ -223,6 +224,7 @@ int sysfs_rename_link(struct kobject *kobj, struct kobject *targ, 
	sysfs_put(sd);

	return result;

}

EXPORT_SYMBOL_GPL(sysfs_rename_link);



static int sysfs_get_target_path(struct sysfs_dirent *parent_sd,

				 struct sysfs_dirent *target_sd, char *path)
@@ -319,8 +321,3 @@ const struct inode_operations sysfs_symlink_inode_operations = { 
	.getattr	= sysfs_getattr,

	.permission	= sysfs_permission,

};
 




EXPORT_SYMBOL_GPL(sysfs_create_link);

EXPORT_SYMBOL_GPL(sysfs_remove_link);

EXPORT_SYMBOL_GPL(sysfs_rename_link);