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

Commit 9c5f1d30 authored by Al Viro's avatar Al Viro
Browse files

dcache: move cond_resched() into the end of __dentry_kill() 



cond_resched() in shrink_dentry_list() is too early

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3a8e3611

fs/dcache.c

+1 −3
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ static void __dentry_kill(struct dentry *dentry) 
	spin_unlock(&dentry->d_lock);

	if (likely(can_free))

		dentry_free(dentry);

	cond_resched();

}



static struct dentry *__lock_parent(struct dentry *dentry)
@@ -849,7 +850,6 @@ void dput(struct dentry *dentry) 


	dentry = dentry_kill(dentry);

	if (dentry) {

		cond_resched();

		goto repeat;

	}

}
@@ -1052,8 +1052,6 @@ static void shrink_dentry_list(struct list_head *list) 
	while (!list_empty(list)) {

		struct dentry *dentry, *parent;



		cond_resched();



		dentry = list_entry(list->prev, struct dentry, d_lru);

		spin_lock(&dentry->d_lock);

		rcu_read_lock();