projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
[firefly-linux-kernel-4.4.55.git]
/
mm
/
filemap.c
diff --git
a/mm/filemap.c
b/mm/filemap.c
index bcc7372aebbc4375d0763e4f3acd8d096bcb612d..ef169f37156da22cc3f07d5dd9092dea00315b7f 100644
(file)
--- a/
mm/filemap.c
+++ b/
mm/filemap.c
@@
-58,7
+58,7
@@
/*
* Lock ordering:
*
/*
* Lock ordering:
*
- * ->i_mmap_lock (
vmtruncat
e)
+ * ->i_mmap_lock (
truncate_pagecach
e)
* ->private_lock (__free_pte->__set_page_dirty_buffers)
* ->swap_lock (exclusive_swap_page, others)
* ->mapping->tree_lock
* ->private_lock (__free_pte->__set_page_dirty_buffers)
* ->swap_lock (exclusive_swap_page, others)
* ->mapping->tree_lock
@@
-104,6
+104,10
@@
*
* ->task->proc_lock
* ->dcache_lock (proc_pid_lookup)
*
* ->task->proc_lock
* ->dcache_lock (proc_pid_lookup)
+ *
+ * (code doesn't rely on that order, so you could switch it around)
+ * ->tasklist_lock (memory_failure, collect_procs_ao)
+ * ->i_mmap_lock
*/
/*
*/
/*
@@
-1607,7
+1611,7
@@
page_not_uptodate:
}
EXPORT_SYMBOL(filemap_fault);
}
EXPORT_SYMBOL(filemap_fault);
-struct vm_operations_struct generic_file_vm_ops = {
+
const
struct vm_operations_struct generic_file_vm_ops = {
.fault = filemap_fault,
};
.fault = filemap_fault,
};