sysfs: consolidate sysfs spinlocks
Replace sysfs_lock and kobj_sysfs_assoc_lock with sysfs_assoc_lock.
sysfs_lock was originally to be used to protect sysfs_dirent tree but
mutex seems better choice, so there is no reason to keep sysfs_lock
separate. Merge the two spinlocks into one.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
index 43cc522..cbd95a4 100644
--- a/fs/sysfs/symlink.c
+++ b/fs/sysfs/symlink.c
@@ -82,12 +82,12 @@
return -EFAULT;
/* target->sd can go away beneath us but is protected with
- * kobj_sysfs_assoc_lock. Fetch target_sd from it.
+ * sysfs_assoc_lock. Fetch target_sd from it.
*/
- spin_lock(&kobj_sysfs_assoc_lock);
+ spin_lock(&sysfs_assoc_lock);
if (target->sd)
target_sd = sysfs_get(target->sd);
- spin_unlock(&kobj_sysfs_assoc_lock);
+ spin_unlock(&sysfs_assoc_lock);
if (!target_sd)
return -ENOENT;