2 files changed, 3 insertions, 4 deletions

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 8813990304fe..85a668680f82 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -431,6 +431,8 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent)
         new_parent_dentry = new_parent ?
                 new_parent->dentry : sysfs_mount->mnt_sb->s_root;
 
+        if (old_parent_dentry->d_inode == new_parent_dentry->d_inode)
+                return 0;       /* nothing to move */
 again:
         mutex_lock(&old_parent_dentry->d_inode->i_mutex);
         if (!mutex_trylock(&new_parent_dentry->d_inode->i_mutex)) {
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index dd1344b007f5..ccb7d722c558 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -227,11 +227,8 @@ static inline void orphan_all_buffers(struct inode *node)
 
         mutex_lock_nested(&node->i_mutex, I_MUTEX_CHILD);
         if (node->i_private) {
-                list_for_each_entry(buf, &set->associates, associates) {
-                        down(&buf->sem);
+                list_for_each_entry(buf, &set->associates, associates)
                         buf->orphaned = 1;
-                        up(&buf->sem);
-                }
         }
         mutex_unlock(&node->i_mutex);
 }