git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: kzalloc() -> kcalloc()
[sfrench/cifs-2.6.git]
/
mm
/
filemap.c
diff --git
a/mm/filemap.c
b/mm/filemap.c
index 0604cb02e6f3b7a3bdbc4eee71a9b0bd413c0212..52517f28e6f4a69020cfc60867f5a57461c89fb8 100644
(file)
--- a/
mm/filemap.c
+++ b/
mm/filemap.c
@@
-2489,7
+2489,7
@@
static void do_async_mmap_readahead(struct vm_area_struct *vma,
*
* We never return with VM_FAULT_RETRY and a bit from VM_FAULT_ERROR set.
*/
*
* We never return with VM_FAULT_RETRY and a bit from VM_FAULT_ERROR set.
*/
-
in
t filemap_fault(struct vm_fault *vmf)
+
vm_fault_
t filemap_fault(struct vm_fault *vmf)
{
int error;
struct file *file = vmf->vma->vm_file;
{
int error;
struct file *file = vmf->vma->vm_file;
@@
-2499,7
+2499,7
@@
int filemap_fault(struct vm_fault *vmf)
pgoff_t offset = vmf->pgoff;
pgoff_t max_off;
struct page *page;
pgoff_t offset = vmf->pgoff;
pgoff_t max_off;
struct page *page;
-
in
t ret = 0;
+
vm_fault_
t ret = 0;
max_off = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);
if (unlikely(offset >= max_off))
max_off = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);
if (unlikely(offset >= max_off))
@@
-2693,11
+2693,11
@@
next:
}
EXPORT_SYMBOL(filemap_map_pages);
}
EXPORT_SYMBOL(filemap_map_pages);
-
in
t filemap_page_mkwrite(struct vm_fault *vmf)
+
vm_fault_
t filemap_page_mkwrite(struct vm_fault *vmf)
{
struct page *page = vmf->page;
struct inode *inode = file_inode(vmf->vma->vm_file);
{
struct page *page = vmf->page;
struct inode *inode = file_inode(vmf->vma->vm_file);
-
in
t ret = VM_FAULT_LOCKED;
+
vm_fault_
t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
file_update_time(vmf->vma->vm_file);
sb_start_pagefault(inode->i_sb);
file_update_time(vmf->vma->vm_file);