dcache: move cond_resched() into the end of __dentry_kill()
cond_resched() in shrink_dentry_list() is too early Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -580,6 +580,7 @@ static void __dentry_kill(struct dentry *dentry)
|
|||||||
spin_unlock(&dentry->d_lock);
|
spin_unlock(&dentry->d_lock);
|
||||||
if (likely(can_free))
|
if (likely(can_free))
|
||||||
dentry_free(dentry);
|
dentry_free(dentry);
|
||||||
|
cond_resched();
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct dentry *__lock_parent(struct dentry *dentry)
|
static struct dentry *__lock_parent(struct dentry *dentry)
|
||||||
@@ -849,7 +850,6 @@ repeat:
|
|||||||
|
|
||||||
dentry = dentry_kill(dentry);
|
dentry = dentry_kill(dentry);
|
||||||
if (dentry) {
|
if (dentry) {
|
||||||
cond_resched();
|
|
||||||
goto repeat;
|
goto repeat;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1052,8 +1052,6 @@ static void shrink_dentry_list(struct list_head *list)
|
|||||||
while (!list_empty(list)) {
|
while (!list_empty(list)) {
|
||||||
struct dentry *dentry, *parent;
|
struct dentry *dentry, *parent;
|
||||||
|
|
||||||
cond_resched();
|
|
||||||
|
|
||||||
dentry = list_entry(list->prev, struct dentry, d_lru);
|
dentry = list_entry(list->prev, struct dentry, d_lru);
|
||||||
spin_lock(&dentry->d_lock);
|
spin_lock(&dentry->d_lock);
|
||||||
rcu_read_lock();
|
rcu_read_lock();
|
||||||
|
|||||||
Reference in New Issue
Block a user