linux-next: manual merge of the akpm tree with Linus' tree

Stephen Rothwell
2013-05-27T06:20:38Z

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in fs/aio.c
between commit 03e04f048d27 ("aio: fix kioctx not being freed after
cancellation at exit time") from Linus' tree and commit "aio: reqs_active
-> reqs_available" from the akpm tree.

I fixed it up (see below - taken from a similar patch later in the akpm
tree) and can carry the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc fs/aio.c
index 7fe5bde,009a7b5..0000000
--- a/fs/aio.c
+++ b/fs/aio.c
@@@ -306,10 -312,8 +312,10 @@@ static void free_ioctx(struct kioctx *c
head = ring->head;
kunmap_atomic(ring);

- while (atomic_read(&ctx->reqs_active) > 0) {
+ while (atomic_read(&ctx->reqs_available) < ctx->nr_events - 1) {
- wait_event(ctx->wait, head != ctx->tail);
+ wait_event(ctx->wait,
- head != ctx->tail ||
- atomic_read(&ctx->reqs_active) <= 0);
++ (head != ctx->tail) ||
++ (atomic_read(&ctx->reqs_available) >= ctx->nr_events - 1));

avail = (head <= ctx->tail ? ctx->tail : ctx->nr_events) - head;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]