Re: [OP] v2.6.22.22-op2-rc1

From: oliver
Date: Thu May 01 2008 - 11:51:29 EST


and the forgotted patch:
---

diff --git a/Makefile b/Makefile
index 7200160..7b7a66c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 22
-EXTRAVERSION = .22-op1
+EXTRAVERSION = .22-op2-rc1
NAME = Holy Dancing Manatees, Batman!

# *DOCUMENTATION*
diff --git a/fs/aio.c b/fs/aio.c
index b3419c5..e683b91 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1171,7 +1171,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;