From: Sage Weil <sage@newdream.net>
Date: Thu, 23 Apr 2009 16:49:13 +0000 (-0700)
Subject: kclient: fix dcache_lock ordering
X-Git-Tag: v0.7.3~64
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=18caea137d7128faa84509d23b98a78b7dc8d990;p=ceph.git

kclient: fix dcache_lock ordering
---

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 8fa6a1b42159..73608bae4bfe 100644
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -1104,11 +1104,11 @@ retry_lookup:
 			goto retry_lookup;
 		} else {
 			/* reorder parent's d_subdirs */
-			spin_lock(&dn->d_lock);
 			spin_lock(&dcache_lock);
+			spin_lock(&dn->d_lock);
 			list_move(&dn->d_u.d_child, &parent->d_subdirs);
-			spin_unlock(&dcache_lock);
 			spin_unlock(&dn->d_lock);
+			spin_unlock(&dcache_lock);
 		}
 
 		di = dn->d_fsdata;