Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 75639
b: refs/heads/master
c: 8f7b3d1
h: refs/heads/master
i:
  75637: a0df2fd
  75635: 2cb911b
  75631: ad44541
v: v3
  • Loading branch information
Anton Salikhmetov authored and Linus Torvalds committed Jan 23, 2008
1 parent 36ee878 commit e5e6b41
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 667984d9e481e43a930a478c588dced98cb61fea
refs/heads/master: 8f7b3d156d348b6766833cd4e272d0d19b501e64
6 changes: 6 additions & 0 deletions trunk/mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -1670,6 +1670,9 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
unlock:
pte_unmap_unlock(page_table, ptl);
if (dirty_page) {
if (vma->vm_file)
file_update_time(vma->vm_file);

/*
* Yes, Virginia, this is actually required to prevent a race
* with clear_page_dirty_for_io() from clearing the page dirty
Expand Down Expand Up @@ -2343,6 +2346,9 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
if (anon)
page_cache_release(vmf.page);
else if (dirty_page) {
if (vma->vm_file)
file_update_time(vma->vm_file);

set_page_dirty_balance(dirty_page, page_mkwrite);
put_page(dirty_page);
}
Expand Down

0 comments on commit e5e6b41

Please sign in to comment.