renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-05 20:24:09 +08:00
Code

fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()

Browse Source 
The nr_dentry_unused per-cpu counter tracks dentries in both the LRU
lists and the shrink lists where the DCACHE_LRU_LIST bit is set.

The shrink_dcache_sb() function moves dentries from the LRU list to a
shrink list and subtracts the dentry count from nr_dentry_unused.  This
is incorrect as the nr_dentry_unused count will also be decremented in
shrink_dentry_list() via d_shrink_del().

To fix this double decrement, the decrement in the shrink_dcache_sb()
function is taken out.

Fixes: 4e717f5c10 ("list_lru: remove special case function list_lru_dispose_all."
Cc: stable@kernel.org
Signed-off-by: Waiman Long <longman@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Waiman Long 2019-01-30 13:52:36 -05:00 committed by Linus Torvalds
parent 1c0490ce90
commit 1dbd449c99
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/dcache.c
View File

@ -1188,15 +1188,11 @@ static enum lru_status dentry_lru_isolate_shrink(struct list_head *item,
*/ */
void shrink_dcache_sb(struct super_block *sb) void shrink_dcache_sb(struct super_block *sb)
{ {
long freed;
do { do {
LIST_HEAD(dispose); LIST_HEAD(dispose);
freed = list_lru_walk(&sb->s_dentry_lru, list_lru_walk(&sb->s_dentry_lru,
dentry_lru_isolate_shrink, &dispose, 1024); dentry_lru_isolate_shrink, &dispose, 1024);
this_cpu_sub(nr_dentry_unused, freed);
shrink_dentry_list(&dispose); shrink_dentry_list(&dispose);
} while (list_lru_count(&sb->s_dentry_lru) > 0); } while (list_lru_count(&sb->s_dentry_lru) > 0);
} }