Merge tag 'for-linus-v3.11-rc3' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / fs / sysfs / group.c

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index aec3d5c98c94fa1d3d79de15a44dfa2a4a77e329..09a1a25cd14540c77d0713b7d1ecd381f78c4886 100644 (file)
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -20,38 +20,64 @@ static void remove_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
                         const struct attribute_group *grp)
 {
        struct attribute *const* attr;
-       int i;
+       struct bin_attribute *const* bin_attr;
 
-       for (i = 0, attr = grp->attrs; *attr; i++, attr++)
-               sysfs_hash_and_remove(dir_sd, NULL, (*attr)->name);
+       if (grp->attrs)
+               for (attr = grp->attrs; *attr; attr++)
+                       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,
                        const struct attribute_group *grp, int update)
 {
        struct attribute *const* attr;
+       struct bin_attribute *const* bin_attr;
        int error = 0, i;
 
-       for (i = 0, attr = grp->attrs; *attr && !error; i++, attr++) {
-               umode_t mode = 0;
+       if (grp->attrs) {
+               for (i = 0, attr = grp->attrs; *attr && !error; i++, attr++) {
+                       umode_t mode = 0;
+
+                       /*
+                        * In update mode, we're changing the permissions or
+                        * visibility.  Do this by first removing then
+                        * re-adding (if required) the file.
+                        */
+                       if (update)
+                               sysfs_hash_and_remove(dir_sd, NULL,
+                                                     (*attr)->name);
+                       if (grp->is_visible) {
+                               mode = grp->is_visible(kobj, *attr, i);
+                               if (!mode)
+                                       continue;
+                       }
+                       error = sysfs_add_file_mode(dir_sd, *attr,
+                                                   SYSFS_KOBJ_ATTR,
+                                                   (*attr)->mode | mode);
+                       if (unlikely(error))
+                               break;
+               }
+               if (error) {
+                       remove_files(dir_sd, kobj, grp);
+                       goto exit;
+               }
+       }
 
-               /* in update mode, we're changing the permissions or
-                * visibility.  Do this by first removing then
-                * re-adding (if required) the file */
-               if (update)
-                       sysfs_hash_and_remove(dir_sd, NULL, (*attr)->name);
-               if (grp->is_visible) {
-                       mode = grp->is_visible(kobj, *attr, i);
-                       if (!mode)
-                               continue;
+       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;
                }
-               error = sysfs_add_file_mode(dir_sd, *attr, SYSFS_KOBJ_ATTR,
-                                           (*attr)->mode | mode);
-               if (unlikely(error))
-                       break;
+               if (error)
+                       remove_files(dir_sd, kobj, grp);
        }
-       if (error)
-               remove_files(dir_sd, kobj, grp);
+exit:
        return error;
 }
 
@@ -67,8 +93,8 @@ static int internal_create_group(struct kobject *kobj, int update,
        /* Updates may happen before the object has been instantiated */
        if (unlikely(update && !kobj->sd))
                return -EINVAL;
-       if (!grp->attrs) {
-               WARN(1, "sysfs: attrs not set by subsystem for group: %s/%s\n",
+       if (!grp->attrs && !grp->bin_attrs) {
+               WARN(1, "sysfs: (bin_)attrs not set by subsystem for group: %s/%s\n",
                        kobj->name, grp->name ? "" : grp->name);
                return -EINVAL;
        }