From 0870833ce1df3f6508e6f3b39a0da41fcb81063d Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Wed, 2 Jan 2008 18:44:05 -0600 Subject: [PATCH] --- yaml --- r: 77096 b: refs/heads/master c: 11f24fbdf511cf588c3a18e3208ee02d85db0020 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/sysfs/file.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 48e58f378b7d..d28709a9b68d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0ad3bc97c06fba5d37b4ca03c03b7eeeda39c47 +refs/heads/master: 11f24fbdf511cf588c3a18e3208ee02d85db0020 diff --git a/trunk/fs/sysfs/file.c b/trunk/fs/sysfs/file.c index 4045bdcc4b33..b834f1709f9f 100644 --- a/trunk/fs/sysfs/file.c +++ b/trunk/fs/sysfs/file.c @@ -568,7 +568,11 @@ int sysfs_add_file_to_group(struct kobject *kobj, struct sysfs_dirent *dir_sd; int error; - dir_sd = sysfs_get_dirent(kobj->sd, group); + if (group) + dir_sd = sysfs_get_dirent(kobj->sd, group); + else + dir_sd = sysfs_get(kobj->sd); + if (!dir_sd) return -ENOENT; @@ -656,7 +660,10 @@ void sysfs_remove_file_from_group(struct kobject *kobj, { struct sysfs_dirent *dir_sd; - dir_sd = sysfs_get_dirent(kobj->sd, group); + if (group) + dir_sd = sysfs_get_dirent(kobj->sd, group); + else + dir_sd = sysfs_get(kobj->sd); if (dir_sd) { sysfs_hash_and_remove(dir_sd, attr->name); sysfs_put(dir_sd);