---

yaml --- r: 226713 b: refs/heads/master c: 89ad485 h: refs/heads/master i: 226711: 994552b v: v3
git-mirror · Jan 7, 2011 · 051b47a · 051b47a
1 parent 329c0f7
commit 051b47a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61f3dee4af09528997a970280da240577bf60721
+refs/heads/master: 89ad485f01fd83c47f17a128db3bd7b89c0f244f
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
@@ -1253,11 +1253,13 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name)
 
 	if (parent) {
 		spin_lock(&parent->d_lock);
-		spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
+		/*
+		 * don't need child lock because it is not subject
+		 * to concurrency here
+		 */
 		dentry->d_parent = dget_dlock(parent);
 		dentry->d_sb = parent->d_sb;
 		list_add(&dentry->d_u.d_child, &parent->d_subdirs);
-		spin_unlock(&dentry->d_lock);
 		spin_unlock(&parent->d_lock);
 	}