projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-v3.20' of git://git.infradead.org/linux-ubifs
[linux-2.6-block.git]
/
fs
/
ubifs
/
file.c
diff --git
a/fs/ubifs/file.c
b/fs/ubifs/file.c
index 4855abcfe25677673c12d911bc07f7e95baad840..e627c0acf6264f6aabc4b2777ab79214e9c32e64 100644
(file)
--- a/
fs/ubifs/file.c
+++ b/
fs/ubifs/file.c
@@
-1536,7
+1536,6
@@
static const struct vm_operations_struct ubifs_file_vm_ops = {
.fault = filemap_fault,
.map_pages = filemap_map_pages,
.page_mkwrite = ubifs_vm_page_mkwrite,
- .remap_pages = generic_file_remap_pages,
};
static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma)