From: Zach Brown Recently aio_p{read,write} changed to perform retries internally rather than returning -EIOCBRETRY. This inadvertantly resulted in always calling aio_{read,write} with ki_left at 0 which would in turn immediately return 0. Harmless, but we can avoid this call by checking in the caller. Signed-off-by: Zach Brown Signed-off-by: Benjamin LaHaise Signed-off-by: Andrew Morton --- fs/aio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN fs/aio.c~aio-avoid-extra-aio_readwrite-call-when-ki_left-==-0 fs/aio.c --- devel/fs/aio.c~aio-avoid-extra-aio_readwrite-call-when-ki_left-==-0 2005-09-28 22:58:18.000000000 -0700 +++ devel-akpm/fs/aio.c 2005-09-28 22:58:18.000000000 -0700 @@ -1347,7 +1347,7 @@ static ssize_t aio_pread(struct kiocb *i * regular files we retry till we complete the entire read or * find that we can't read any more data (e.g short reads). */ - } while (ret > 0 && + } while (ret > 0 && iocb->ki_left > 0 && !S_ISFIFO(inode->i_mode) && !S_ISSOCK(inode->i_mode)); /* This means we must have transferred all that we could */ @@ -1371,7 +1371,7 @@ static ssize_t aio_pwrite(struct kiocb * iocb->ki_buf += ret; iocb->ki_left -= ret; } - } while (ret > 0); + } while (ret > 0 && iocb->ki_left > 0); if ((ret == 0) || (iocb->ki_left == 0)) ret = iocb->ki_nbytes - iocb->ki_left; _