The patch titled
Subject: mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix
has been removed from the -mm tree. Its filename was
mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix.patch
This patch was dropped because it was folded into mm-allow-page-fault-handlers-to-perform-the-cow.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix
Cc: Matthew Wilcox <matthew.r.wilcox@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff -puN mm/memory.c~mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix mm/memory.c
--- a/mm/memory.c~mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix
+++ a/mm/memory.c
@@ -2897,8 +2897,8 @@ static int do_cow_fault(struct mm_struct
page_cache_release(fault_page);
} else {
/*
- * DAX doesn't have a page to lock, so it uses
- * i_mmap_lock()
+ * The fault handler has no page to lock, so it holds
+ * i_mmap_lock for read to protect against truncate.
*/
i_mmap_unlock_read(vma->vm_file->f_mapping);
}
@@ -2912,11 +2912,11 @@ static int do_cow_fault(struct mm_struct
unlock_page(fault_page);
page_cache_release(fault_page);
} else {
- /*
- * DAX doesn't have a page to lock, so it uses
- * i_mmap_lock()
- */
- i_mmap_unlock_read(vma->vm_file->f_mapping);
+ /*
+ * The fault handler has no page to lock, so it holds
+ * i_mmap_lock for read to protect against truncate.
+ */
+ i_mmap_unlock_read(vma->vm_file->f_mapping);
}
return ret;
uncharge_out:
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-fix-xip-fault-vs-truncate-race.patch
mm-allow-page-fault-handlers-to-perform-the-cow.patch
daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix.patch
daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-2.patch
daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-3.patch
dax-add-dax_zero_page_range-fix.patch
ext4-add-dax-functionality-fix.patch
ocfs2-add-functions-to-add-and-remove-inode-in-orphan-dir-fix.patch
ocfs2-implement-ocfs2_direct_io_write-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
