diff options
author | Christoph Lameter <clameter@engr.sgi.com> | 2007-03-05 03:30:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-05 10:57:51 -0500 |
commit | 0dc952dc3e6d96d554a19fa7bee3f3b1d55e3cff (patch) | |
tree | 1dcf2ff93784716143b7acef816888a71a9504c2 /mm/mempolicy.c | |
parent | 1f2b69f9bdce8461341e5fb864568a2ee90079c8 (diff) |
[PATCH] Page migration: Fix vma flag checking
Currently we do not check for vma flags if sys_move_pages is called to move
individual pages. If sys_migrate_pages is called to move pages then we
check for vm_flags that indicate a non migratable vma but that still
includes VM_LOCKED and we can migrate mlocked pages.
Extract the vma_migratable check from mm/mempolicy.c, fix it and put it
into migrate.h so that is can be used from both locations.
Problem was spotted by Lee Schermerhorn
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/mempolicy.c')
-rw-r--r-- | mm/mempolicy.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index cf2a5381030a..d76e8eb342d0 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
@@ -321,15 +321,6 @@ static inline int check_pgd_range(struct vm_area_struct *vma, | |||
321 | return 0; | 321 | return 0; |
322 | } | 322 | } |
323 | 323 | ||
324 | /* Check if a vma is migratable */ | ||
325 | static inline int vma_migratable(struct vm_area_struct *vma) | ||
326 | { | ||
327 | if (vma->vm_flags & ( | ||
328 | VM_LOCKED|VM_IO|VM_HUGETLB|VM_PFNMAP|VM_RESERVED)) | ||
329 | return 0; | ||
330 | return 1; | ||
331 | } | ||
332 | |||
333 | /* | 324 | /* |
334 | * Check if all pages in a range are on a set of nodes. | 325 | * Check if all pages in a range are on a set of nodes. |
335 | * If pagelist != NULL then isolate pages from the LRU and | 326 | * If pagelist != NULL then isolate pages from the LRU and |