Here's an incremental patch.
--
On Wed, Apr 15, 2009 at 06:38:47PM -0700, Andrew Morton wrote:
> Whoa. Running file_update_time() under lock_page() opens a whole can
> of worms, doesn't it? That thing can do journal commits and all sorts
> of stuff. And I don't think this ordering is necessary here?
Signed-off-by: Nick Piggin <npiggin@xxxxxxx>
---
mm/memory.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
Index: linux-2.6/mm/memory.c
===================================================================
--- linux-2.6.orig/mm/memory.c
+++ linux-2.6/mm/memory.c
@@ -2105,9 +2105,6 @@ gotten:
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
@@ -2129,6 +2126,10 @@ unlock:
page_cache_release(dirty_page);
balance_dirty_pages_ratelimited(mapping);
}
+
+ /* file_update_time outside page_lock */
+ if (vma->vm_file)
+ file_update_time(vma->vm_file);
}
return ret;
oom_free_new:
@@ -2760,15 +2761,16 @@ out:
if (dirty_page) {
struct address_space *mapping = page->mapping;
- if (vma->vm_file)
- file_update_time(vma->vm_file);
-
if (set_page_dirty(dirty_page))
page_mkwrite = 1;
unlock_page(dirty_page);
put_page(dirty_page);
if (page_mkwrite)
balance_dirty_pages_ratelimited(mapping);
+
+ /* file_update_time outside page_lock */
+ if (vma->vm_file)
+ file_update_time(vma->vm_file);
} else {
unlock_page(vmf.page);
if (anon)
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
