projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm/huge_memory: rename freeze_page() to unmap_page()
[linux-2.6-block.git]
/
mm
/
huge_memory.c
diff --git
a/mm/huge_memory.c
b/mm/huge_memory.c
index 55478ab3c83be372f9fa4d654f16e32ffdeb1e29..30100fac234193a5fd63b44563a7268b118fb29d 100644
(file)
--- a/
mm/huge_memory.c
+++ b/
mm/huge_memory.c
@@
-2350,7
+2350,7
@@
void vma_adjust_trans_huge(struct vm_area_struct *vma,
}
}
}
}
-static void
freeze
_page(struct page *page)
+static void
unmap
_page(struct page *page)
{
enum ttu_flags ttu_flags = TTU_IGNORE_MLOCK | TTU_IGNORE_ACCESS |
TTU_RMAP_LOCKED | TTU_SPLIT_HUGE_PMD;
{
enum ttu_flags ttu_flags = TTU_IGNORE_MLOCK | TTU_IGNORE_ACCESS |
TTU_RMAP_LOCKED | TTU_SPLIT_HUGE_PMD;
@@
-2365,7
+2365,7
@@
static void freeze_page(struct page *page)
VM_BUG_ON_PAGE(!unmap_success, page);
}
VM_BUG_ON_PAGE(!unmap_success, page);
}
-static void
unfreeze
_page(struct page *page)
+static void
remap
_page(struct page *page)
{
int i;
if (PageTransHuge(page)) {
{
int i;
if (PageTransHuge(page)) {
@@
-2483,7
+2483,7
@@
static void __split_huge_page(struct page *page, struct list_head *list,
spin_unlock_irqrestore(zone_lru_lock(page_zone(head)), flags);
spin_unlock_irqrestore(zone_lru_lock(page_zone(head)), flags);
-
unfreeze
_page(head);
+
remap
_page(head);
for (i = 0; i < HPAGE_PMD_NR; i++) {
struct page *subpage = head + i;
for (i = 0; i < HPAGE_PMD_NR; i++) {
struct page *subpage = head + i;
@@
-2664,7
+2664,7
@@
int split_huge_page_to_list(struct page *page, struct list_head *list)
}
/*
}
/*
- * Racy check if we can split the page, before
freeze
_page() will
+ * Racy check if we can split the page, before
unmap
_page() will
* split PMDs
*/
if (!can_split_huge_page(head, &extra_pins)) {
* split PMDs
*/
if (!can_split_huge_page(head, &extra_pins)) {
@@
-2673,7
+2673,7
@@
int split_huge_page_to_list(struct page *page, struct list_head *list)
}
mlocked = PageMlocked(page);
}
mlocked = PageMlocked(page);
-
freeze
_page(head);
+
unmap
_page(head);
VM_BUG_ON_PAGE(compound_mapcount(head), head);
/* Make sure the page is not on per-CPU pagevec as it takes pin */
VM_BUG_ON_PAGE(compound_mapcount(head), head);
/* Make sure the page is not on per-CPU pagevec as it takes pin */
@@
-2727,7
+2727,7
@@
int split_huge_page_to_list(struct page *page, struct list_head *list)
fail: if (mapping)
xa_unlock(&mapping->i_pages);
spin_unlock_irqrestore(zone_lru_lock(page_zone(head)), flags);
fail: if (mapping)
xa_unlock(&mapping->i_pages);
spin_unlock_irqrestore(zone_lru_lock(page_zone(head)), flags);
-
unfreeze
_page(head);
+
remap
_page(head);
ret = -EBUSY;
}
ret = -EBUSY;
}