From 051b47a4262536f70d59e45f404b59dcef4965f9 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Fri, 7 Jan 2011 17:49:41 +1100 Subject: [PATCH] --- yaml --- r: 226713 b: refs/heads/master c: 89ad485f01fd83c47f17a128db3bd7b89c0f244f h: refs/heads/master i: 226711: 994552b6b04f4506a1554cf4630c605afe1d3ca6 v: v3 --- [refs] | 2 +- trunk/fs/dcache.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8fa766f6550c..16a077d43ca7 100644 --- 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 index 98a05696593e..ccdc5c2512df 100644 --- 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); }