commit a2e1859adb3b05fa99f87a67df9ef2a4b7b04a13
author Al Viro <viro@zeniv.linux.org.uk> Tue Mar 20 16:27:57 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Sat Mar 31 16:03:15 2012 -0400
tree 2d6ba3300b595f2db3fdb3407fc2d028a7baf68a
parent 06af121eab543e5554f7a29538f171a382aaf855

aio: take final put_ioctx() into callers of io_destroy()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/aio.c

diff --git a/fs/aio.c b/fs/aio.c
index fe37a94..da88760 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1270,7 +1270,6 @@
 	 * locking done by the above calls to ensure this consistency.
 	 */
 	wake_up_all(&ioctx->wait);
-	put_ioctx(ioctx);	/* once for the lookup */
 }
 
 /* sys_io_setup:
@@ -1307,11 +1306,9 @@
 	ret = PTR_ERR(ioctx);
 	if (!IS_ERR(ioctx)) {
 		ret = put_user(ioctx->user_id, ctxp);
-		if (!ret) {
-			put_ioctx(ioctx);
-			return 0;
-		}
-		io_destroy(ioctx);
+		if (ret)
+			io_destroy(ioctx);
+		put_ioctx(ioctx);
 	}
 
 out:
@@ -1329,6 +1326,7 @@
 	struct kioctx *ioctx = lookup_ioctx(ctx);
 	if (likely(NULL != ioctx)) {
 		io_destroy(ioctx);
+		put_ioctx(ioctx);
 		return 0;
 	}
 	pr_debug("EINVAL: io_destroy: invalid context id\n");