Subject: [merged] aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time.patch removed from -mm tree
To: bcrl@xxxxxxxxx,jwboyer@xxxxxxxxxx,koverstreet@xxxxxxxxxx,zab@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 28 May 2013 12:37:25 -0700
The patch titled
Subject: aio: fix kioctx not being freed after cancellation at exit time
has been removed from the -mm tree. Its filename was
aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Benjamin LaHaise <bcrl@xxxxxxxxx>
Subject: aio: fix kioctx not being freed after cancellation at exit time
The recent changes overhauling fs/aio.c introduced a bug that results in
the kioctx not being freed when outstanding kiocbs are cancelled at
exit_aio() time. Specifically, a kiocb that is cancelled has its
completion events discarded by batch_complete_aio(), which then fails to
wake up the process stuck in free_ioctx(). Fix this by modifying the
wait_event() condition in free_ioctx() appropriately.
This patch was tested with the cancel operation in the thread based code
posted yesterday.
[akpm@xxxxxxxxxxxxxxxxxxxx: fix build]
Signed-off-by: Benjamin LaHaise <bcrl@xxxxxxxxx>
Signed-off-by: Kent Overstreet <koverstreet@xxxxxxxxxx>
Cc: Kent Overstreet <koverstreet@xxxxxxxxxx>
Cc: Josh Boyer <jwboyer@xxxxxxxxxx>
Cc: Zach Brown <zab@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/aio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN fs/aio.c~aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time fs/aio.c
--- a/fs/aio.c~aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time
+++ a/fs/aio.c
@@ -307,7 +307,9 @@ static void free_ioctx(struct kioctx *ct
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;
_
Patches currently in -mm which might be from bcrl@xxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
