Skip to content

Commit

Permalink
expand the call of dentry_lru_del() in dentry_kill()
Browse files Browse the repository at this point in the history
commit 01b6035 upstream.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Al Viro authored and Greg Kroah-Hartman committed Aug 17, 2015
1 parent 5d81116 commit 065c70f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion fs/dcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,12 @@ dentry_kill(struct dentry *dentry, int unlock_on_failure)
if ((dentry->d_flags & DCACHE_OP_PRUNE) && !d_unhashed(dentry))
dentry->d_op->d_prune(dentry);

dentry_lru_del(dentry);
if (dentry->d_flags & DCACHE_LRU_LIST) {
if (!(dentry->d_flags & DCACHE_SHRINK_LIST))
d_lru_del(dentry);
else
d_shrink_del(dentry);
}
/* if it was on the hash then remove it */
__d_drop(dentry);
__list_del_entry(&dentry->d_child);
Expand Down

0 comments on commit 065c70f

Please sign in to comment.