[PATCH] sysfs: fix problem with duplicate sysfs directories and files

[safe/jmp/linux-2.6] / fs / sysfs / symlink.c

diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
index e38d633..fe23f47 100644 (file)
--- a/fs/sysfs/symlink.c
+++ b/fs/sysfs/symlink.c
@@ -82,12 +82,13 @@ exit1:
 int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char * name)
 {
        struct dentry * dentry = kobj->dentry;
-       int error = 0;
+       int error = -EEXIST;
 
        BUG_ON(!kobj || !kobj->dentry || !name);
 
        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;
 }