X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=fs%2Fdcache.c;h=9e5099997fcd8da473bbdf50211873108c4f7194;hb=55a16df2140d31fde235023ade95b9572c5386fd;hp=d049200362690961431ae07c41bb9582ae6ebf94;hpb=da9a92f0cde9ce34a930d7edcaef30429e41d14a;p=firefly-linux-kernel-4.4.55.git

diff --git a/fs/dcache.c b/fs/dcache.c
index d04920036269..9e5099997fcd 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -578,7 +578,6 @@ static struct dentry *dentry_kill(struct dentry *dentry)
 
 failed:
 	spin_unlock(&dentry->d_lock);
-	cpu_relax();
 	return dentry; /* try again with same dentry */
 }
 
@@ -752,6 +751,8 @@ void dput(struct dentry *dentry)
 		return;
 
 repeat:
+	might_sleep();
+
 	rcu_read_lock();
 	if (likely(fast_dput(dentry))) {
 		rcu_read_unlock();
@@ -783,8 +784,10 @@ repeat:
 
 kill_it:
 	dentry = dentry_kill(dentry);
-	if (dentry)
+	if (dentry) {
+		cond_resched();
 		goto repeat;
+	}
 }
 EXPORT_SYMBOL(dput);