[PATCH] Vectorize aio_read/aio_write fileop methods
This patch vectorizes aio_read() and aio_write() methods to prepare for collapsing all aio & vectored operations into one interface - which is aio_read()/aio_write(). Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Cc: Michael Holzheu <HOLZHEU@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
9ea0f9499d
commit
027445c372
15
fs/aio.c
15
fs/aio.c
@@ -15,6 +15,7 @@
|
||||
#include <linux/aio_abi.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/syscalls.h>
|
||||
#include <linux/uio.h>
|
||||
|
||||
#define DEBUG 0
|
||||
|
||||
@@ -1315,8 +1316,11 @@ static ssize_t aio_pread(struct kiocb *iocb)
|
||||
ssize_t ret = 0;
|
||||
|
||||
do {
|
||||
ret = file->f_op->aio_read(iocb, iocb->ki_buf,
|
||||
iocb->ki_left, iocb->ki_pos);
|
||||
iocb->ki_inline_vec.iov_base = iocb->ki_buf;
|
||||
iocb->ki_inline_vec.iov_len = iocb->ki_left;
|
||||
|
||||
ret = file->f_op->aio_read(iocb, &iocb->ki_inline_vec,
|
||||
1, iocb->ki_pos);
|
||||
/*
|
||||
* Can't just depend on iocb->ki_left to determine
|
||||
* whether we are done. This may have been a short read.
|
||||
@@ -1349,8 +1353,11 @@ static ssize_t aio_pwrite(struct kiocb *iocb)
|
||||
ssize_t ret = 0;
|
||||
|
||||
do {
|
||||
ret = file->f_op->aio_write(iocb, iocb->ki_buf,
|
||||
iocb->ki_left, iocb->ki_pos);
|
||||
iocb->ki_inline_vec.iov_base = iocb->ki_buf;
|
||||
iocb->ki_inline_vec.iov_len = iocb->ki_left;
|
||||
|
||||
ret = file->f_op->aio_write(iocb, &iocb->ki_inline_vec,
|
||||
1, iocb->ki_pos);
|
||||
if (ret > 0) {
|
||||
iocb->ki_buf += ret;
|
||||
iocb->ki_left -= ret;
|
||||
|
Reference in New Issue
Block a user