The patch titled AIO completion signal notification small cleanup has been added to the -mm tree. Its filename is aio-completion-signal-notification-small-cleanup.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: AIO completion signal notification small cleanup From: Sébastien Dugué <sebastien.dugue@xxxxxxxx> Clean up aio_setup_sigevent() to make it more readable. Signed-off-by: Sébastien Dugué <sebastien.dugue@xxxxxxxx> Cc: Laurent Vivier <laurent.vivier@xxxxxxxx> Cc: Bharata B Rao <bharata@xxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> Cc: Suparna Bhattacharya <suparna@xxxxxxxxxx> Cc: Zach Brown <zach.brown@xxxxxxxxxx> Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Cc: Badari Pulavarty <pbadari@xxxxxxxxxx> Cc: Benjamin LaHaise <bcrl@xxxxxxxxxxxxxxx> Cc: Jean Pierre Dion <jean-pierre.dion@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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); /* _ Patches currently in -mm which might be from sebastien.dugue@xxxxxxxx are rework-compat_sys_io_submit.patch fix-aioh-includes.patch fix-access_ok-checks.patch make-good_sigevent-non-static.patch make-good_sigevent-non-static-fix.patch make-__sigqueue_free-and.patch aio-completion-signal-notification.patch aio-completion-signal-notification-fix.patch aio-completion-signal-notification-fixes-and-cleanups.patch aio-completion-signal-notification-small-cleanup.patch add-listio-syscall-support.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html