33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
From: Jens Axboe <axboe@kernel.dk>
|
|
Date: Tue, 6 Nov 2018 14:27:13 -0700
|
|
Subject: [02/14] aio: use assigned completion handler
|
|
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit?id=b3373253f0bab538a7521537dfcb73e731b3d732
|
|
|
|
commit bc9bff61624ac33b7c95861abea1af24ee7a94fc upstream.
|
|
|
|
We know this is a read/write request, but in preparation for
|
|
having different kinds of those, ensure that we call the assigned
|
|
handler instead of assuming it's aio_complete_rq().
|
|
|
|
Reviewed-by: Christoph Hellwig <hch@lst.de>
|
|
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
|
Cc: Guenter Roeck <linux@roeck-us.net>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
fs/aio.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/fs/aio.c b/fs/aio.c
|
|
index 78aa249070b1..3df3fb0678e5 100644
|
|
--- a/fs/aio.c
|
|
+++ b/fs/aio.c
|
|
@@ -1492,7 +1492,7 @@ static inline void aio_rw_done(struct kiocb *req, ssize_t ret)
|
|
ret = -EINTR;
|
|
/*FALLTHRU*/
|
|
default:
|
|
- aio_complete_rw(req, ret, 0);
|
|
+ req->ki_complete(req, ret, 0);
|
|
}
|
|
}
|
|
|