diff --git a/[refs] b/[refs]
index 9927d1512512..13ad3d2f678f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87c3a86e1c220121d0ced59d1a71e78ed9abc6dd
+refs/heads/master: 65c24491b4fef017c64e39ec64384fde5e05e0a0
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
index 4a9d4d641fb9..76da12537956 100644
--- a/trunk/fs/aio.c
+++ b/trunk/fs/aio.c
@@ -587,7 +587,7 @@ int aio_put_req(struct kiocb *req)
 static struct kioctx *lookup_ioctx(unsigned long ctx_id)
 {
 	struct mm_struct *mm = current->mm;
-	struct kioctx *ctx = NULL;
+	struct kioctx *ctx, *ret = NULL;
 	struct hlist_node *n;
 
 	rcu_read_lock();
@@ -595,12 +595,13 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id)
 	hlist_for_each_entry_rcu(ctx, n, &mm->ioctx_list, list) {
 		if (ctx->user_id == ctx_id && !ctx->dead) {
 			get_ioctx(ctx);
+			ret = ctx;
 			break;
 		}
 	}
 
 	rcu_read_unlock();
-	return ctx;
+	return ret;
 }
 
 /*