Commit c2e5e29f authored by Al Viro's avatar Al Viro

to_shrink_list(): call only if refcount is 0

The only thing it does if refcount is not zero is d_lru_del(); no
point, IMO, seeing that plain dput() does nothing of that sort...

Note that 2 of 3 current callers are guaranteed that refcount is 0.
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5e7a5c8d
...@@ -915,8 +915,7 @@ __must_hold(&dentry->d_lock) ...@@ -915,8 +915,7 @@ __must_hold(&dentry->d_lock)
if (!(dentry->d_flags & DCACHE_SHRINK_LIST)) { if (!(dentry->d_flags & DCACHE_SHRINK_LIST)) {
if (dentry->d_flags & DCACHE_LRU_LIST) if (dentry->d_flags & DCACHE_LRU_LIST)
d_lru_del(dentry); d_lru_del(dentry);
if (!dentry->d_lockref.count) d_shrink_add(dentry, list);
d_shrink_add(dentry, list);
} }
} }
...@@ -1115,10 +1114,8 @@ EXPORT_SYMBOL(d_prune_aliases); ...@@ -1115,10 +1114,8 @@ EXPORT_SYMBOL(d_prune_aliases);
static inline void shrink_kill(struct dentry *victim, struct list_head *list) static inline void shrink_kill(struct dentry *victim, struct list_head *list)
{ {
struct dentry *parent = victim->d_parent; struct dentry *parent = victim->d_parent;
if (parent != victim) { if (parent != victim && !--parent->d_lockref.count)
--parent->d_lockref.count;
to_shrink_list(parent, list); to_shrink_list(parent, list);
}
__dentry_kill(victim); __dentry_kill(victim);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment