From 1e3372af7b7ae5063679b42f55598851d24cd6f1 Mon Sep 17 00:00:00 2001
From: Yan Zheng <yanzheng@21cn.com>
Date: Mon, 8 Oct 2007 12:16:20 -0700
Subject: [PATCH] --- yaml --- r: 65319 b: refs/heads/master c:
 87e2831c3fa39cbf6f7ab676bb5aef039b9659e2 h: refs/heads/master i:   65317:
 da717859c11028f432d581a71437a93edec3729c   65315:
 e320520b0a10d87feb160a859defca4fc29e578d   65311:
 a9e7efeb9dbd0d7593853a2da84b3b87c3dd27fd v: v3

---
 [refs]         | 2 +-
 trunk/fs/aio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f9f4dbd445fb..512015f02ebc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 745ad48e8cac47beec0b2f72dc3c64424bce1fec
+refs/heads/master: 87e2831c3fa39cbf6f7ab676bb5aef039b9659e2
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
index dbe699e9828c..ea2e19820381 100644
--- a/trunk/fs/aio.c
+++ b/trunk/fs/aio.c
@@ -1562,6 +1562,7 @@ int fastcall io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
 		fput(file);
 		return -EAGAIN;
 	}
+	req->ki_filp = file;
 	if (iocb->aio_flags & IOCB_FLAG_RESFD) {
 		/*
 		 * If the IOCB_FLAG_RESFD flag of aio_flags is set, get an
@@ -1576,7 +1577,6 @@ int fastcall io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
 		}
 	}
 
-	req->ki_filp = file;
 	ret = put_user(req->ki_key, &user_iocb->aio_key);
 	if (unlikely(ret)) {
 		dprintk("EFAULT: aio_key\n");