Commit a0c42bac authored Sep 22, 2010 by Jan Kara Committed by Linus Torvalds Sep 22, 2010

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>

parent d1908362

fs/aio.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -712,8 +712,16 @@ static ssize_t aio_run_iocb(struct kiocb *iocb)
		*/
		ret = retry(iocb);

		if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED)
		if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED) {
		/*
		* There's no easy way to restart the syscall since other AIO's
		* may be already running. Just fail this IO with EINTR.
		*/
		if (unlikely(ret == -ERESTARTSYS \|\| ret == -ERESTARTNOINTR \|\|
		ret == -ERESTARTNOHAND \|\| ret == -ERESTART_RESTARTBLOCK))
		ret = -EINTR;
		aio_complete(iocb, ret, 0);
		}
		out:
		spin_lock_irq(&ctx->ctx_lock);

Admin message