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
5d258c4
..
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,
};
@@
-42,7
+42,8
@@
const struct file_operations ramfs_file_operations = {
.write = do_sync_write,
.aio_write = generic_file_aio_write,
.fsync = simple_sync_file,
.write = do_sync_write,
.aio_write = generic_file_aio_write,
.fsync = simple_sync_file,
- .sendfile = generic_file_sendfile,
+ .splice_read = generic_file_splice_read,
+ .splice_write = generic_file_splice_write,
.llseek = generic_file_llseek,
};
.llseek = generic_file_llseek,
};
@@
-295,5
+296,10
@@
unsigned long ramfs_nommu_get_unmapped_area(struct file *file,
*/
int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma)
{
*/
int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma)
{
- return vma->vm_flags & VM_SHARED ? 0 : -ENOSYS;
+ if (!(vma->vm_flags & VM_SHARED))
+ return -ENOSYS;
+
+ file_accessed(file);
+ vma->vm_ops = &generic_file_vm_ops;
+ return 0;
}
}