Commit f5c8a8a4 authored by Al Viro's avatar Al Viro
Browse files

switch select_collect{,2}() to use of to_shrink_list() 



Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c2e5e29f

fs/dcache.c

+6 −14
Original line number Diff line number Diff line
@@ -1495,14 +1495,10 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry) 


	if (dentry->d_flags & DCACHE_SHRINK_LIST) {

		data->found++;

	} else {

		if (dentry->d_flags & DCACHE_LRU_LIST)

			d_lru_del(dentry);

		if (!dentry->d_lockref.count) {

			d_shrink_add(dentry, &data->dispose);

	} else if (!dentry->d_lockref.count) {

		to_shrink_list(dentry, &data->dispose);

		data->found++;

	}

	}

	/*

	 * We can return to the caller if we have found some (this

	 * ensures forward progress). We'll be coming back to find
@@ -1522,17 +1518,13 @@ static enum d_walk_ret select_collect2(void *_data, struct dentry *dentry) 
	if (data->start == dentry)

		goto out;



	if (dentry->d_flags & DCACHE_SHRINK_LIST) {

	if (!dentry->d_lockref.count) {

		if (dentry->d_flags & DCACHE_SHRINK_LIST) {

			rcu_read_lock();

			data->victim = dentry;

			return D_WALK_QUIT;

		}

	} else {

		if (dentry->d_flags & DCACHE_LRU_LIST)

			d_lru_del(dentry);

		if (!dentry->d_lockref.count)

			d_shrink_add(dentry, &data->dispose);

		to_shrink_list(dentry, &data->dispose);

	}

	/*

	 * We can return to the caller if we have found some (this