Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4c3b708 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: workingset: remove zero-seek setting for shadow node shrinker"

parents f5863f3c 6e8ec4ea

fs/kernfs/mount.c

+3 −0
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ static int kernfs_fill_super(struct super_block *sb, unsigned long magic) 
		sb->s_export_op = &kernfs_export_ops;

	sb->s_time_gran = 1;



	/* sysfs dentries and inodes don't require IO to create */

	sb->s_shrink.seeks = 0;



	/* get root inode, initialize and unlock it */

	mutex_lock(&kernfs_mutex);

	inode = kernfs_get_inode(sb, info->root->kn);

fs/proc/inode.c

+3 −0
Original line number Diff line number Diff line
@@ -512,6 +512,9 @@ int proc_fill_super(struct super_block *s) 
	 */

	s->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH;

	

	/* procfs dentries and inodes don't require IO to create */

	s->s_shrink.seeks = 0;



	pde_get(&proc_root);

	root_inode = proc_get_inode(s, &proc_root);

	if (!root_inode) {

mm/vmscan.c

+12 −3
Original line number Diff line number Diff line
@@ -479,9 +479,18 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, 
	nr = atomic_long_xchg(&shrinker->nr_deferred[nid], 0);



	total_scan = nr;

	if (shrinker->seeks) {

		delta = freeable >> priority;

		delta *= 4;

		do_div(delta, shrinker->seeks);

	} else {

		/*

		 * These objects don't require any IO to create. Trim

		 * them aggressively under memory pressure to keep

		 * them from causing refetches in the IO caches.

		 */

		delta = freeable / 2;

	}



	total_scan += delta;

	if (total_scan < 0) {