From 409d45e34ccd8020924bc17c5f17031b9b87f343 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 22 Jun 2006 14:47:31 -0700 Subject: [PATCH] --- yaml --- r: 28570 b: refs/heads/master c: d702ccb342e49f7591df5a87c3857c698183b0fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/dcache.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b4292fc49c4f..25a0e06cdc4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0feae5c47aabdde59cbbec32d150e17102de37f0 +refs/heads/master: d702ccb342e49f7591df5a87c3857c698183b0fa diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c index 385f5dbc4b0c..59dbc92c2079 100644 --- a/trunk/fs/dcache.c +++ b/trunk/fs/dcache.c @@ -359,12 +359,13 @@ void d_prune_aliases(struct inode *inode) } /* - * Throw away a dentry - free the inode, dput the parent. - * This requires that the LRU list has already been - * removed. + * Throw away a dentry - free the inode, dput the parent. This requires that + * the LRU list has already been removed. + * * Called with dcache_lock, drops it and then regains. + * Called with dentry->d_lock held, drops it. */ -static inline void prune_one_dentry(struct dentry * dentry) +static void prune_one_dentry(struct dentry * dentry) { struct dentry * parent;