aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorNick Piggin <npiggin@kernel.dk>2011-01-07 01:49:43 -0500
committerNick Piggin <npiggin@kernel.dk>2011-01-07 01:50:24 -0500
commitdc0474be3e27463d4d4a2793f82366eed906f223 (patch)
tree41f75e638442cb343bacdcfbabb17ffc3bd5b4ce /kernel
parent357f8e658bba8a085c4a5d4331e30894be8096b8 (diff)
fs: dcache rationalise dget variants
dget_locked was a shortcut to avoid the lazy lru manipulation when we already held dcache_lock (lru manipulation was relatively cheap at that point). However, how that the lru lock is an innermost one, we never hold it at any caller, so the lock cost can now be avoided. We already have well working lazy dcache LRU, so it should be fine to defer LRU manipulations to scan time. Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 1864cb6a6a59..9f41470c3949 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -887,7 +887,7 @@ static void cgroup_clear_directory(struct dentry *dentry)
887 /* This should never be called on a cgroup 887 /* This should never be called on a cgroup
888 * directory with child cgroups */ 888 * directory with child cgroups */
889 BUG_ON(d->d_inode->i_mode & S_IFDIR); 889 BUG_ON(d->d_inode->i_mode & S_IFDIR);
890 dget_locked_dlock(d); 890 dget_dlock(d);
891 spin_unlock(&d->d_lock); 891 spin_unlock(&d->d_lock);
892 spin_unlock(&dentry->d_lock); 892 spin_unlock(&dentry->d_lock);
893 d_delete(d); 893 d_delete(d);