[rh7,12/14] fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()

Submitted by Andrey Ryabinin on June 10, 2019, 3:13 p.m.


Message ID 20190610151400.12820-12-aryabinin@virtuozzo.com
State New
Series "Series without cover letter"
Headers show

Commit Message

Andrey Ryabinin June 10, 2019, 3:13 p.m.
From: Waiman Long <longman@redhat.com>

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: 4e717f5c1083 ("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>
 fs/dcache.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/dcache.c b/fs/dcache.c
index 29514f33d6bd..f33f43e77449 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1051,15 +1051,11 @@  static enum lru_status dentry_lru_isolate_shrink(struct list_head *item,
 void shrink_dcache_sb(struct super_block *sb)
-	long freed;
 	do {
-		freed = list_lru_walk(&sb->s_dentry_lru,
+		list_lru_walk(&sb->s_dentry_lru,
 			dentry_lru_isolate_shrink, &dispose, 1024);
-		this_cpu_sub(nr_dentry_unused, freed);
 	} while (list_lru_count(&sb->s_dentry_lru) > 0);