From: Sébastien Dugué <sebastien.dugue@bull.net>

Clean up aio_setup_sigevent() to make it more readable.

Signed-off-by: Sébastien Dugué <sebastien.dugue@bull.net>
Cc: Laurent Vivier <laurent.vivier@bull.net>
Cc: Bharata B Rao <bharata@in.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Suparna Bhattacharya <suparna@in.ibm.com>
Cc: Zach Brown <zach.brown@oracle.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Benjamin LaHaise <bcrl@linux.intel.com>
Cc: Jean Pierre Dion <jean-pierre.dion@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/aio.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff -puN fs/aio.c~aio-completion-signal-notification-small-cleanup fs/aio.c
--- a/fs/aio.c~aio-completion-signal-notification-small-cleanup
+++ a/fs/aio.c
@@ -961,21 +961,11 @@ static long aio_setup_sigevent(struct ai
 	    event.sigev_notify != SIGEV_THREAD_ID)
 		return -EINVAL;
 
-	notify->notify = event.sigev_notify;
-	notify->signo = event.sigev_signo;
-	notify->value = event.sigev_value;
-
 	rcu_read_lock();
 	target = sigevent_find_task(&event);
 
-	if (unlikely(!target)) {
-		/*
-		 * Revert notify to SIGEV_NONE so that really_put_req()
-		 * knows that no ref has been taken on a task.
-		 */
-		notify->notify = SIGEV_NONE;
+	if (unlikely(!target))
 		goto out_unlock;
-	}
 
 	/*
 	 * At this point, we know that notify is either SIGEV_SIGNAL or
@@ -987,6 +977,9 @@ static long aio_setup_sigevent(struct ai
 	notify->target = target;
 	rcu_read_unlock();
 
+	notify->notify = event.sigev_notify;
+	notify->signo = event.sigev_signo;
+	notify->value = event.sigev_value;
 	notify->sigq = __sigqueue_alloc(current, GFP_KERNEL, 0);
 
 	/*
_