From e5e6b41c5e1682cb435cb01ca73d8d21dc1a054c Mon Sep 17 00:00:00 2001 From: Anton Salikhmetov Date: Wed, 23 Jan 2008 02:21:18 +0300 Subject: [PATCH] --- yaml --- r: 75639 b: refs/heads/master c: 8f7b3d156d348b6766833cd4e272d0d19b501e64 h: refs/heads/master i: 75637: a0df2fd0a7bc642b67c51502f74ed9405bf04e86 75635: 2cb911b00aae733faf77e5715391036d01f10033 75631: ad44541f59444dcfbff66f200b845e20e40a7ddc v: v3 --- [refs] | 2 +- trunk/mm/memory.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4cc30746e7a9..97e3272028ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 667984d9e481e43a930a478c588dced98cb61fea +refs/heads/master: 8f7b3d156d348b6766833cd4e272d0d19b501e64 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 6dd1cd88bfb6..4b0144b24c12 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -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 @@ -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); }