|
@@ -2295,10 +2295,10 @@ int finish_mkwrite_fault(struct vm_fault *vmf)
|
|
|
*/
|
|
|
if (!pte_same(*vmf->pte, vmf->orig_pte)) {
|
|
|
pte_unmap_unlock(vmf->pte, vmf->ptl);
|
|
|
- return 0;
|
|
|
+ return VM_FAULT_NOPAGE;
|
|
|
}
|
|
|
wp_page_reuse(vmf);
|
|
|
- return VM_FAULT_WRITE;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -2341,8 +2341,7 @@ static int wp_page_shared(struct vm_fault *vmf)
|
|
|
return tmp;
|
|
|
}
|
|
|
tmp = finish_mkwrite_fault(vmf);
|
|
|
- if (unlikely(!tmp || (tmp &
|
|
|
- (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) {
|
|
|
+ if (unlikely(tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE))) {
|
|
|
unlock_page(vmf->page);
|
|
|
put_page(vmf->page);
|
|
|
return tmp;
|