---

yaml --- r: 376282 b: refs/heads/master c: 03e04f0 h: refs/heads/master v: v3
git-mirror · May 24, 2013 · d42ccdc · d42ccdc
1 parent 53783d2
commit d42ccdc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9ff785e4437c83d2179161e012f5bdfbd6381f0
+refs/heads/master: 03e04f048d2774aabd126fbad84729d4ba9dc40a
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
@@ -307,7 +307,9 @@ static void free_ioctx(struct kioctx *ctx)
 	kunmap_atomic(ring);
 
 	while (atomic_read(&ctx->reqs_active) > 0) {
-		wait_event(ctx->wait, head != ctx->tail);
+		wait_event(ctx->wait,
+				head != ctx->tail ||
+				atomic_read(&ctx->reqs_active) <= 0);
 
 		avail = (head <= ctx->tail ? ctx->tail : ctx->nr_events) - head;