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
userfaultfd: Add missing vma_merge parameter
[firefly-linux-kernel-4.4.55.git]
/
mm
/
memory.c
diff --git
a/mm/memory.c
b/mm/memory.c
index deb679c31f2ab897cafebf72643aec4f66233308..c387430f06c319d52794152b7e100a66a10c9f68 100644
(file)
--- a/
mm/memory.c
+++ b/
mm/memory.c
@@
-3015,9
+3015,9
@@
static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
} else {
/*
* The fault handler has no page to lock, so it holds
} else {
/*
* The fault handler has no page to lock, so it holds
- * i_mmap_lock for
write
to protect against truncate.
+ * i_mmap_lock for
read
to protect against truncate.
*/
*/
- i_mmap_unlock_
write
(vma->vm_file->f_mapping);
+ i_mmap_unlock_
read
(vma->vm_file->f_mapping);
}
goto uncharge_out;
}
}
goto uncharge_out;
}
@@
-3031,9
+3031,9
@@
static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
} else {
/*
* The fault handler has no page to lock, so it holds
} else {
/*
* The fault handler has no page to lock, so it holds
- * i_mmap_lock for
write
to protect against truncate.
+ * i_mmap_lock for
read
to protect against truncate.
*/
*/
- i_mmap_unlock_
write
(vma->vm_file->f_mapping);
+ i_mmap_unlock_
read
(vma->vm_file->f_mapping);
}
return ret;
uncharge_out:
}
return ret;
uncharge_out: