Subject: Re: linux-next: build failure after merge of the aio tree

From: Dave Kleikamp <[email-masked]>
Date: Wed, 21 Aug 2013 10:52:27 -0500

Stephen,

There's another problem after the merge. Now that buf is passed into
aio_run_iocb(), ki_iter is no longer needed. It's not getting
initialized and causes an oops.

Signed-off-by: Dave Kleikamp <[email-masked]>
- ---
 fs/aio.c            | 4 ++--
 include/linux/aio.h | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/aio.c b/fs/aio.c
index 59b46cd..9f783e3 100644
- --- a/fs/aio.c
+++ b/fs/aio.c
@@ -1281,11 +1281,11 @@ rw_common:
 		break;
 
 	case IOCB_CMD_READ_ITER:
- -		ret = aio_read_iter(req, req->ki_iter);
+		ret = aio_read_iter(req, (void *)buf);
 		break;
 
 	case IOCB_CMD_WRITE_ITER:
- -		ret = aio_write_iter(req, req->ki_iter);
+		ret = aio_write_iter(req, (void *)buf);
 		break;
 
 	case IOCB_CMD_FDSYNC:
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 4fab377..c08d3ed 100644
- --- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -54,7 +54,6 @@ struct kiocb {
 	 * this is the underlying eventfd context to deliver events to.
 	 */
 	struct eventfd_ctx	*ki_eventfd;
- -	struct iov_iter		*ki_iter;
 };
 
 static inline bool is_sync_kiocb(struct kiocb *kiocb)
- -- 
1.8.3.4