diff options
author | Badari Pulavarty <pbadari@us.ibm.com> | 2006-10-01 02:28:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:28 -0400 |
commit | 027445c37282bc1ed26add45e573ad2d3e4860a5 (patch) | |
tree | 93eab101a938ffebaea64703033c8649df4d73f0 /drivers/char/raw.c | |
parent | 9ea0f9499d15c49df23e7aac4332d830c40e12d0 (diff) |
[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>
Diffstat (limited to 'drivers/char/raw.c')
-rw-r--r-- | drivers/char/raw.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/char/raw.c b/drivers/char/raw.c index c596a08c07b3..173fb08555d5 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c | |||
@@ -249,23 +249,11 @@ static ssize_t raw_file_write(struct file *file, const char __user *buf, | |||
249 | return generic_file_write_nolock(file, &local_iov, 1, ppos); | 249 | return generic_file_write_nolock(file, &local_iov, 1, ppos); |
250 | } | 250 | } |
251 | 251 | ||
252 | static ssize_t raw_file_aio_write(struct kiocb *iocb, const char __user *buf, | ||
253 | size_t count, loff_t pos) | ||
254 | { | ||
255 | struct iovec local_iov = { | ||
256 | .iov_base = (char __user *)buf, | ||
257 | .iov_len = count | ||
258 | }; | ||
259 | |||
260 | return generic_file_aio_write_nolock(iocb, &local_iov, 1, &iocb->ki_pos); | ||
261 | } | ||
262 | |||
263 | |||
264 | static const struct file_operations raw_fops = { | 252 | static const struct file_operations raw_fops = { |
265 | .read = generic_file_read, | 253 | .read = generic_file_read, |
266 | .aio_read = generic_file_aio_read, | 254 | .aio_read = generic_file_aio_read, |
267 | .write = raw_file_write, | 255 | .write = raw_file_write, |
268 | .aio_write = raw_file_aio_write, | 256 | .aio_write = generic_file_aio_write_nolock, |
269 | .open = raw_open, | 257 | .open = raw_open, |
270 | .release= raw_release, | 258 | .release= raw_release, |
271 | .ioctl = raw_ioctl, | 259 | .ioctl = raw_ioctl, |