Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ab9cea1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

sysfs: add support for binary attributes in groups 



groups should be able to support binary attributes, just like it
supports "normal" attributes.  This lets us only handle one type of
structure, groups, throughout the driver core and subsystems, making
binary attributes a "full fledged" part of the driver model, and not
something just "tacked on".

Reported-by: default avatarOliver Schinagl <oliver@schinagl.nl>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ced321bf

fs/sysfs/group.c

+46 −20
Original line number Original line Diff line number Diff line
@@ -20,38 +20,64 @@ static void remove_files(struct sysfs_dirent *dir_sd, struct kobject *kobj, 
			 const struct attribute_group *grp)

			 const struct attribute_group *grp)

{

{

	struct attribute *const* attr;

	struct attribute *const* attr;

	int i;

	struct bin_attribute *const* bin_attr;





	for (i = 0, attr = grp->attrs; *attr; i++, attr++)

	if (grp->attrs)

		for (attr = grp->attrs; *attr; attr++)

			sysfs_hash_and_remove(dir_sd, NULL, (*attr)->name);

			sysfs_hash_and_remove(dir_sd, NULL, (*attr)->name);

	if (grp->bin_attrs)

		for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++)

			sysfs_remove_bin_file(kobj, *bin_attr);

}

}





static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,

static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,

			const struct attribute_group *grp, int update)

			const struct attribute_group *grp, int update)

{

{

	struct attribute *const* attr;

	struct attribute *const* attr;

	struct bin_attribute *const* bin_attr;

	int error = 0, i;

	int error = 0, i;





	if (grp->attrs) {

		for (i = 0, attr = grp->attrs; *attr && !error; i++, attr++) {

		for (i = 0, attr = grp->attrs; *attr && !error; i++, attr++) {

			umode_t mode = 0;

			umode_t mode = 0;





		/* in update mode, we're changing the permissions or

			/*

			 * In update mode, we're changing the permissions or

			 * visibility.  Do this by first removing then

			 * visibility.  Do this by first removing then

		 * re-adding (if required) the file */

			 * re-adding (if required) the file.

			 */

			if (update)

			if (update)

			sysfs_hash_and_remove(dir_sd, NULL, (*attr)->name);

				sysfs_hash_and_remove(dir_sd, NULL,

						      (*attr)->name);

			if (grp->is_visible) {

			if (grp->is_visible) {

				mode = grp->is_visible(kobj, *attr, i);

				mode = grp->is_visible(kobj, *attr, i);

				if (!mode)

				if (!mode)

					continue;

					continue;

			}

			}

		error = sysfs_add_file_mode(dir_sd, *attr, SYSFS_KOBJ_ATTR,

			error = sysfs_add_file_mode(dir_sd, *attr,

						    SYSFS_KOBJ_ATTR,

						    (*attr)->mode | mode);

						    (*attr)->mode | mode);

			if (unlikely(error))

			if (unlikely(error))

				break;

				break;

		}

		}

		if (error) {

			remove_files(dir_sd, kobj, grp);

			goto exit;

		}

	}



	if (grp->bin_attrs) {

		for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++) {

			if (update)

				sysfs_remove_bin_file(kobj, *bin_attr);

			error = sysfs_create_bin_file(kobj, *bin_attr);

			if (error)

				break;

		}

		if (error)

		if (error)

			remove_files(dir_sd, kobj, grp);

			remove_files(dir_sd, kobj, grp);

	}

exit:

	return error;

	return error;

}

}

include/linux/sysfs.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 




struct kobject;

struct kobject;

struct module;

struct module;

struct bin_attribute;

enum kobj_ns_type;

enum kobj_ns_type;





struct attribute {

struct attribute {
@@ -59,10 +60,9 @@ struct attribute_group { 
	umode_t			(*is_visible)(struct kobject *,

	umode_t			(*is_visible)(struct kobject *,

					      struct attribute *, int);

					      struct attribute *, int);

	struct attribute	**attrs;

	struct attribute	**attrs;

	struct bin_attribute	**bin_attrs;

};

};









/**

/**

 * Use these macros to make defining attributes easier. See include/linux/device.h

 * Use these macros to make defining attributes easier. See include/linux/device.h

 * for examples..

 * for examples..