From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 6 Nov 2018 21:27:13 +0000 (-0700)
Subject: aio: use assigned completion handler
X-Git-Tag: archive/raspbian/5.2.17-1+rpi1^2^2^2^2~102
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ade37c63dad88809ba3546a1803ed8dfc657c9f;p=linux.git

aio: use assigned completion handler

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>

Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name 0002-aio-use-assigned-completion-handler.patch
---

diff --git a/fs/aio.c b/fs/aio.c
index 78aa249070b..3df3fb0678e 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);
 	}
 }