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 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
fs
/
ramfs
/
file-nommu.c
diff --git
a/fs/ramfs/file-nommu.c
b/fs/ramfs/file-nommu.c
index
237fe8b
..
52312ec
100644
(file)
--- a/
fs/ramfs/file-nommu.c
+++ b/
fs/ramfs/file-nommu.c
@@
-29,8
+29,8
@@
static int ramfs_nommu_setattr(struct dentry *, struct iattr *);
const struct address_space_operations ramfs_aops = {
.readpage = simple_readpage,
const struct address_space_operations ramfs_aops = {
.readpage = simple_readpage,
- .
prepare_write = simple_prepare_write
,
- .
commit_write = simple_commit_write
,
+ .
write_begin = simple_write_begin
,
+ .
write_end = simple_write_end
,
.set_page_dirty = __set_page_dirty_no_writeback,
};
.set_page_dirty = __set_page_dirty_no_writeback,
};
@@
-43,6
+43,7
@@
const struct file_operations ramfs_file_operations = {
.aio_write = generic_file_aio_write,
.fsync = simple_sync_file,
.splice_read = generic_file_splice_read,
.aio_write = generic_file_aio_write,
.fsync = simple_sync_file,
.splice_read = generic_file_splice_read,
+ .splice_write = generic_file_splice_write,
.llseek = generic_file_llseek,
};
.llseek = generic_file_llseek,
};