[OP] v2.6.22.22-op2-rc1

[OP] v2.6.22.22-op2-rc1

[oliver]

linux v2.6.22.22-op2-rc1
  "stable" review patch
 
  what is this tree?
  it is my long term supported kernel, when i have time for it, i
  backported the most important fixes.
 
  http://repo.or.cz/w/linux-2.6.22.y-op.git rc
  http://repo.or.cz/w/linux-2.6.22.y-op-patches.git

---
Makefile |    2 +-
 fs/aio.c |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

---

Jeff Moyer (1):
      aio: only account I/O wait time in read_events if there are active
requests

Oliver Pinter (1):
      v2.6.22.22-op2-rc1

---

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

[oliver]

[-- Attachment #1: Type: text/plain, Size: 30 bytes --]

and the forgotted patch:
---


[-- Attachment #2: patch-v2.6.22.22-op1-v2.6.22.22-op2-rc1 --]
[-- Type: text/plain, Size: 696 bytes --]

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;