|
@@ -596,7 +596,6 @@ static struct dentry *dentry_kill(struct dentry *dentry)
|
|
|
|
|
|
failed:
|
|
failed:
|
|
spin_unlock(&dentry->d_lock);
|
|
spin_unlock(&dentry->d_lock);
|
|
- cpu_relax();
|
|
|
|
return dentry; /* try again with same dentry */
|
|
return dentry; /* try again with same dentry */
|
|
}
|
|
}
|
|
|
|
|
|
@@ -770,6 +769,8 @@ void dput(struct dentry *dentry)
|
|
return;
|
|
return;
|
|
|
|
|
|
repeat:
|
|
repeat:
|
|
|
|
+ might_sleep();
|
|
|
|
+
|
|
rcu_read_lock();
|
|
rcu_read_lock();
|
|
if (likely(fast_dput(dentry))) {
|
|
if (likely(fast_dput(dentry))) {
|
|
rcu_read_unlock();
|
|
rcu_read_unlock();
|
|
@@ -803,8 +804,10 @@ repeat:
|
|
|
|
|
|
kill_it:
|
|
kill_it:
|
|
dentry = dentry_kill(dentry);
|
|
dentry = dentry_kill(dentry);
|
|
- if (dentry)
|
|
|
|
|
|
+ if (dentry) {
|
|
|
|
+ cond_resched();
|
|
goto repeat;
|
|
goto repeat;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(dput);
|
|
EXPORT_SYMBOL(dput);
|
|
|
|
|