X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mm%2Fmempool.c;h=fe6e05289cc5b5b7b30f036980fb7ea3835892e0;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=ccd8cb8cd41f59fc19e2198bfb2862ad72d62ff9;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/mm/mempool.c b/mm/mempool.c
index ccd8cb8cd..fe6e05289 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -238,13 +238,8 @@ repeat_alloc:
 	init_wait(&wait);
 	prepare_to_wait(&pool->wait, &wait, TASK_UNINTERRUPTIBLE);
 	smp_mb();
-	if (!pool->curr_nr) {
-		/*
-		 * FIXME: this should be io_schedule().  The timeout is there
-		 * as a workaround for some DM problems in 2.6.18.
-		 */
-		io_schedule_timeout(5*HZ);
-	}
+	if (!pool->curr_nr)
+		io_schedule();
 	finish_wait(&pool->wait, &wait);
 
 	goto repeat_alloc;