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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
fs
/
sysfs
/
symlink.c
diff --git
a/fs/sysfs/symlink.c
b/fs/sysfs/symlink.c
index
e5ce6e7
..
f50e3cc
100644
(file)
--- a/
fs/sysfs/symlink.c
+++ b/
fs/sysfs/symlink.c
@@
-3,6
+3,7
@@
*/
#include <linux/fs.h>
*/
#include <linux/fs.h>
+#include <linux/mount.h>
#include <linux/module.h>
#include <linux/kobject.h>
#include <linux/namei.h>
#include <linux/module.h>
#include <linux/kobject.h>
#include <linux/namei.h>
@@
-82,13
+83,23
@@
exit1:
*/
int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char * name)
{
*/
int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char * name)
{
- struct dentry * dentry = kobj->dentry;
- int error = 0;
+ struct dentry *dentry = NULL;
+ int error = -EEXIST;
+
+ BUG_ON(!name);
+
+ if (!kobj) {
+ if (sysfs_mount && sysfs_mount->mnt_sb)
+ dentry = sysfs_mount->mnt_sb->s_root;
+ } else
+ dentry = kobj->dentry;
- BUG_ON(!kobj || !kobj->dentry || !name);
+ if (!dentry)
+ return -EFAULT;
mutex_lock(&dentry->d_inode->i_mutex);
mutex_lock(&dentry->d_inode->i_mutex);
- error = sysfs_add_link(dentry, name, target);
+ if (!sysfs_dirent_exist(dentry->d_fsdata, name))
+ error = sysfs_add_link(dentry, name, target);
mutex_unlock(&dentry->d_inode->i_mutex);
return error;
}
mutex_unlock(&dentry->d_inode->i_mutex);
return error;
}