git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
fs
/
jffs2
/
file.c
diff --git
a/fs/jffs2/file.c
b/fs/jffs2/file.c
index
bb8844f
..
242875f
100644
(file)
--- a/
fs/jffs2/file.c
+++ b/
fs/jffs2/file.c
@@
-42,8
+42,10
@@
const struct file_operations jffs2_file_operations =
{
.llseek = generic_file_llseek,
.open = generic_file_open,
{
.llseek = generic_file_llseek,
.open = generic_file_open,
- .read = generic_file_read,
- .write = generic_file_write,
+ .read = do_sync_read,
+ .aio_read = generic_file_aio_read,
+ .write = do_sync_write,
+ .aio_write = generic_file_aio_write,
.ioctl = jffs2_ioctl,
.mmap = generic_file_readonly_mmap,
.fsync = jffs2_fsync,
.ioctl = jffs2_ioctl,
.mmap = generic_file_readonly_mmap,
.fsync = jffs2_fsync,
@@
-62,7
+64,7
@@
struct inode_operations jffs2_file_inode_operations =
.removexattr = jffs2_removexattr
};
.removexattr = jffs2_removexattr
};
-struct address_space_operations jffs2_file_address_operations =
+
const
struct address_space_operations jffs2_file_address_operations =
{
.readpage = jffs2_readpage,
.prepare_write =jffs2_prepare_write,
{
.readpage = jffs2_readpage,
.prepare_write =jffs2_prepare_write,