X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Faio.c;h=9dec7d2d546e0e12e200898993f1b272111f5cee;hb=00d70419fc8f86db94f56e0191be392c4a57f244;hp=f12db415c0f6aa7b2776bdbcec1279a35c17da7f;hpb=2af170dd241810212cbdbdc802ba7d39e3fb23b9;p=linux-2.6-omap-h63xx.git

diff --git a/fs/aio.c b/fs/aio.c
index f12db415c0f..9dec7d2d546 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1161,7 +1161,12 @@ retry:
 			ret = 0;
 			if (to.timed_out)	/* Only check after read evt */
 				break;
-			io_schedule();
+			/* Try to only show up in io wait if there are ops
+			 *  in flight */
+			if (ctx->reqs_active)
+				io_schedule();
+			else
+				schedule();
 			if (signal_pending(tsk)) {
 				ret = -EINTR;
 				break;