file ->get_unmapped_area() shouldn't duplicate work of get_unmapped_area()
RFC PATCH 8/18 file ->get_unmapped_area() shouldn't duplicate work of get_unmapped_area()
... we should call mm ->get_unmapped_area() instead and let our caller do the final checks.
Signed-off-by Al Viro <[email protected]>
--- arch/sparc/kernel/sys_sparc_64.c | 10 +++++++--- ipc/shm.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-)
arch/sparc/kernel/sys_sparc_64.c +7 -3
@@ -317,10 +317,14 @@ bottomup:unsigned long get_fb_unmapped_area (struct file *filp,unsigned long orig_addr,unsigned long len,unsigned long pgoff,unsigned long flags) {unsigned long align_goal, addr = -ENOMEM ; +unsigned long (*get_area)(struct file *,unsigned long , +unsigned long ,unsigned long ,unsigned long ); + + get_area = current->mm->get_unmapped_area;if (flags &MAP_FIXED ) {/* Ok, don't mess with it. */ -return get_unmapped_area (NULL , orig_addr, len, pgoff, flags); +return get_area (NULL , orig_addr, len, pgoff, flags); } flags &= ~MAP_SHARED ;
@@ -333,7 +337,7 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u align_goal = (64UL *1024 ); do { - addr = get_unmapped_area(NULL, orig_addr, len + (align_goal - PAGE_SIZE), pgoff, flags); + addr = get_area(NULL, orig_addr, len + (align_goal - PAGE_SIZE), pgoff, flags); if (!(addr & ~PAGE_MASK)) { addr = (addr + (align_goal - 1UL)) & ~(align_goal - 1UL); break;
@@ -351,7 +355,7 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u* be obtained. */ if (addr & ~PAGE_MASK ) - addr =get_unmapped_area (NULL , orig_addr, len, pgoff, flags); + addr =get_area (NULL , orig_addr, len, pgoff, flags);return addr; }
ipc/shm.c +1 -1
@@ -290,7 +290,7 @@ static unsigned long shm_get_unmapped_area(struct file *file, unsigned long flags) {struct shm_file_data *sfd =shm_file_data (file); -return get_unmapped_area (sfd->file, addr, len, pgoff, flags); +return current->mm->get_unmapped_area (sfd->file, addr, len, pgoff, flags); }int is_file_shm_hugepages (struct file *file)
Signature · 1 line
1.5.6.5
From: Al Viro <[email protected]>
Date: Sat, 05 Dec 2009 19:08:50 +0000
Quoted 5 lines
... we should call mm ->get_unmapped_area() instead and let our caller do the final checks.
Signed-off-by Al Viro <[email protected]>
Acked-by David S. Miller <[email protected]>