git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
fs
/
sysfs
/
group.c
diff --git
a/fs/sysfs/group.c
b/fs/sysfs/group.c
index
61b2462
..
f11ac5e
100644
(file)
--- a/
fs/sysfs/group.c
+++ b/
fs/sysfs/group.c
@@
-31,7
+31,7
@@
static int create_files(struct dentry * dir,
int error = 0;
for (attr = grp->attrs; *attr && !error; attr++) {
int error = 0;
for (attr = grp->attrs; *attr && !error; attr++) {
- error = sysfs_add_file(dir,
*attr
);
+ error = sysfs_add_file(dir,
*attr, SYSFS_KOBJ_ATTR
);
}
if (error)
remove_files(dir,grp);
}
if (error)
remove_files(dir,grp);
@@
-45,6
+45,8
@@
int sysfs_create_group(struct kobject * kobj,
struct dentry * dir;
int error;
struct dentry * dir;
int error;
+ BUG_ON(!kobj || !kobj->dentry);
+
if (grp->name) {
error = sysfs_create_subdir(kobj,grp->name,&dir);
if (error)
if (grp->name) {
error = sysfs_create_subdir(kobj,grp->name,&dir);
if (error)
@@
-78,5
+80,5
@@
void sysfs_remove_group(struct kobject * kobj,
}
}
-EXPORT_SYMBOL(sysfs_create_group);
-EXPORT_SYMBOL(sysfs_remove_group);
+EXPORT_SYMBOL
_GPL
(sysfs_create_group);
+EXPORT_SYMBOL
_GPL
(sysfs_remove_group);