lkml.org 
[lkml]   [2013]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] procfs: also fix proc_reg_get_unmapped_area() for !MMU case
Commit fad1a86e ("procfs: call default get_unmapped_area on MMU-present
architectures"), as its title says, took care of only the MMU case,
leaving the !MMU side still in the regressed state (returning -EIO in
all cases where pde->proc_fops->get_unmapped_area is NULL).

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
---
fs/proc/inode.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)

--- 3.13-rc1/fs/proc/inode.c
+++ 3.13-rc1-proc-get-unmapped-area/fs/proc/inode.c
@@ -292,16 +292,19 @@ proc_reg_get_unmapped_area(struct file *
{
struct proc_dir_entry *pde = PDE(file_inode(file));
unsigned long rv = -EIO;
- unsigned long (*get_area)(struct file *, unsigned long, unsigned long,
- unsigned long, unsigned long) = NULL;
+
if (use_pde(pde)) {
+ typeof(proc_reg_get_unmapped_area) *get_area
#ifdef CONFIG_MMU
- get_area = current->mm->get_unmapped_area;
+ = pde->proc_fops->get_unmapped_area
+ ?: current->mm->get_unmapped_area;
+#else
+ = pde->proc_fops->get_unmapped_area;
#endif
- if (pde->proc_fops->get_unmapped_area)
- get_area = pde->proc_fops->get_unmapped_area;
- if (get_area)
- rv = get_area(file, orig_addr, len, pgoff, flags);
+
+ rv = get_area
+ ? get_area(file, orig_addr, len, pgoff, flags)
+ : orig_addr;
unuse_pde(pde);
}
return rv;




\
 
 \ /
  Last update: 2013-11-25 21:41    [W:0.047 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site