aboutsummaryrefslogtreecommitdiff
path: root/fs/ext2/file.c
diff options
context:
space:
mode:
authorCarsten Otte <cotte@de.ibm.com>2005-06-23 22:05:28 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 00:06:41 -0700
commiteb6fe0c388e43b02e261f0fdee60e42f6298d7f7 (patch)
tree3924bfbbbb10afc19f3bcd4963af14121f2c0553 /fs/ext2/file.c
parent6d79125bba55ee82701f1c7d4ebbc1aa20ecbe4e (diff)
downloadlinaro-lsk-eb6fe0c388e43b02e261f0fdee60e42f6298d7f7.tar.gz
[PATCH] xip: reduce code duplication
This patch reworks filemap_xip.c with the goal to reduce code duplication from mm/filemap.c. It applies agains 2.6.12-rc6-mm1. Instead of implementing the aio functions, this one implements the synchronous read/write functions only. For readv and writev, the generic fallback is used. For aio, we rely on the application doing the fallback. Since our "synchronous" function does memcpy immediately anyway, there is no performance difference between using the fallbacks or implementing each operation. Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/ext2/file.c')
-rw-r--r--fs/ext2/file.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index 2b3d572365a..a484412fc78 100644
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -58,17 +58,13 @@ struct file_operations ext2_file_operations = {
#ifdef CONFIG_EXT2_FS_XIP
struct file_operations ext2_xip_file_operations = {
.llseek = generic_file_llseek,
- .read = do_sync_read,
- .write = do_sync_write,
- .aio_read = xip_file_aio_read,
- .aio_write = xip_file_aio_write,
+ .read = xip_file_read,
+ .write = xip_file_write,
.ioctl = ext2_ioctl,
.mmap = xip_file_mmap,
.open = generic_file_open,
.release = ext2_release_file,
.fsync = ext2_sync_file,
- .readv = xip_file_readv,
- .writev = xip_file_writev,
.sendfile = xip_file_sendfile,
};
#endif