[PATCH] aio: avoid extra aio_{read,write} call when ki_left == 0

[safe/jmp/linux-2.6] / fs / aio.c

diff --git a/fs/aio.c b/fs/aio.c
index 9edc0e4..d6b1551 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1347,7 +1347,7 @@ static ssize_t aio_pread(struct kiocb *iocb)
                 * 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)
                        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;