sysfs_assoc_lock which protects kobj <-> sd association is now only used in fs/sysfs/kobject.c. Move it there and make it static.
Signed-off-by: Tejun Heo <[EMAIL PROTECTED]> --- fs/sysfs/dir.c | 1 - fs/sysfs/kobject.c | 2 ++ fs/sysfs/sysfs.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index d0eb9bf..a74ca4a 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -31,7 +31,6 @@ */ DEFINE_MUTEX(sysfs_op_mutex); DEFINE_MUTEX(sysfs_mutex); -spinlock_t sysfs_assoc_lock = SPIN_LOCK_UNLOCKED; static spinlock_t sysfs_ino_lock = SPIN_LOCK_UNLOCKED; static DEFINE_IDA(sysfs_ino_ida); diff --git a/fs/sysfs/kobject.c b/fs/sysfs/kobject.c index 55b884b..16e10de 100644 --- a/fs/sysfs/kobject.c +++ b/fs/sysfs/kobject.c @@ -19,6 +19,8 @@ #define to_sattr(a) container_of(a,struct subsys_attribute, attr) +static spinlock_t sysfs_assoc_lock = SPIN_LOCK_UNLOCKED; + static int sysfs_remove_child(struct sysfs_dirent *parent, const char *name) { struct sysfs_dirent *sd; diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index 69e1451..732b292 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h @@ -89,7 +89,6 @@ extern struct kmem_cache *sysfs_dir_cachep; */ extern struct mutex sysfs_op_mutex; extern struct mutex sysfs_mutex; -extern spinlock_t sysfs_assoc_lock; extern const struct file_operations sysfs_dir_operations; extern const struct inode_operations sysfs_dir_inode_operations; -- 1.5.0.3 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/