aio: block exit_aio() until all context requests are completed

commit 6098b45b32e6baeacc04790773ced9340601d511 upstream.

It seems that exit_aio() also needs to wait for all iocbs to complete (like
io_destroy), but we missed the wait step in current implemention, so fix
it in the same way as we did in io_destroy.

Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/fs/aio.c b/fs/aio.c
index b732a9c3204278062ae7898b00eb27b6b20ad390..66bd7e4447ad4db996e172e28b7c89f894a7e97f 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -796,6 +796,9 @@ void exit_aio(struct mm_struct *mm)
        unsigned i = 0;
 
        while (1) {
+               struct completion requests_done =
+                       COMPLETION_INITIALIZER_ONSTACK(requests_done);
+
                rcu_read_lock();
                table = rcu_dereference(mm->ioctx_table);
 
@@ -823,7 +826,10 @@ void exit_aio(struct mm_struct *mm)
                 */
                ctx->mmap_size = 0;
 
-               kill_ioctx(mm, ctx, NULL);
+               kill_ioctx(mm, ctx, &requests_done);
+
+               /* Wait until all IO for the context are done. */
+               wait_for_completion(&requests_done);
        }
 }