Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit a0c42bac79731276c9b2f28d54f9e658fcf843a2

Authored by Jan Kara
Committed by Linus Torvalds
1 parent d1908362ae

aio: do not return ERESTARTSYS as a result of AIO 

OCFS2 can return ERESTARTSYS from its write function when the process is
signalled while waiting for a cluster lock (and the filesystem is mounted
with intr mount option).  Generally, it seems reasonable to allow
filesystems to return this error code from its IO functions.  As we must
not leak ERESTARTSYS (and similar error codes) to userspace as a result of
an AIO operation, we have to properly convert it to EINTR inside AIO code
(restarting the syscall isn't really an option because other AIO could
have been already submitted by the same io_submit syscall).

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Zach Brown <zach.brown@oracle.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 9 additions and 1 deletions Side-by-side Diff

... ... @@ -712,8 +712,16 @@
712 712 */
713 713 ret = retry(iocb);
714 714  
715   - if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED)
  715 + if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED) {
  716 + /*
  717 + * There's no easy way to restart the syscall since other AIO's
  718 + * may be already running. Just fail this IO with EINTR.
  719 + */
  720 + if (unlikely(ret == -ERESTARTSYS || ret == -ERESTARTNOINTR ||
  721 + ret == -ERESTARTNOHAND || ret == -ERESTART_RESTARTBLOCK))
  722 + ret = -EINTR;
716 723 aio_complete(iocb, ret, 0);
  724 + }
717 725 out:
718 726 spin_lock_irq(&ctx->ctx_lock);
719 727