diff options
Diffstat (limited to 'fs/ceph/inode.c')
-rw-r--r-- | fs/ceph/inode.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 2c6944473366..2a48cafc174b 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c | |||
@@ -841,7 +841,6 @@ static void ceph_set_dentry_offset(struct dentry *dn) | |||
841 | di->offset = ceph_inode(inode)->i_max_offset++; | 841 | di->offset = ceph_inode(inode)->i_max_offset++; |
842 | spin_unlock(&inode->i_lock); | 842 | spin_unlock(&inode->i_lock); |
843 | 843 | ||
844 | spin_lock(&dcache_lock); | ||
845 | spin_lock(&dir->d_lock); | 844 | spin_lock(&dir->d_lock); |
846 | spin_lock_nested(&dn->d_lock, DENTRY_D_LOCK_NESTED); | 845 | spin_lock_nested(&dn->d_lock, DENTRY_D_LOCK_NESTED); |
847 | list_move(&dn->d_u.d_child, &dir->d_subdirs); | 846 | list_move(&dn->d_u.d_child, &dir->d_subdirs); |
@@ -849,7 +848,6 @@ static void ceph_set_dentry_offset(struct dentry *dn) | |||
849 | dn->d_u.d_child.prev, dn->d_u.d_child.next); | 848 | dn->d_u.d_child.prev, dn->d_u.d_child.next); |
850 | spin_unlock(&dn->d_lock); | 849 | spin_unlock(&dn->d_lock); |
851 | spin_unlock(&dir->d_lock); | 850 | spin_unlock(&dir->d_lock); |
852 | spin_unlock(&dcache_lock); | ||
853 | } | 851 | } |
854 | 852 | ||
855 | /* | 853 | /* |
@@ -1233,13 +1231,11 @@ retry_lookup: | |||
1233 | goto retry_lookup; | 1231 | goto retry_lookup; |
1234 | } else { | 1232 | } else { |
1235 | /* reorder parent's d_subdirs */ | 1233 | /* reorder parent's d_subdirs */ |
1236 | spin_lock(&dcache_lock); | ||
1237 | spin_lock(&parent->d_lock); | 1234 | spin_lock(&parent->d_lock); |
1238 | spin_lock_nested(&dn->d_lock, DENTRY_D_LOCK_NESTED); | 1235 | spin_lock_nested(&dn->d_lock, DENTRY_D_LOCK_NESTED); |
1239 | list_move(&dn->d_u.d_child, &parent->d_subdirs); | 1236 | list_move(&dn->d_u.d_child, &parent->d_subdirs); |
1240 | spin_unlock(&dn->d_lock); | 1237 | spin_unlock(&dn->d_lock); |
1241 | spin_unlock(&parent->d_lock); | 1238 | spin_unlock(&parent->d_lock); |
1242 | spin_unlock(&dcache_lock); | ||
1243 | } | 1239 | } |
1244 | 1240 | ||
1245 | di = dn->d_fsdata; | 1241 | di = dn->d_fsdata; |