diff options
author | HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> | 2013-11-12 18:11:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 22:09:33 -0500 |
commit | 5721cf84d9d8d41915f77dd639969b7fa91b6a79 (patch) | |
tree | 55f36e8e631b6c36509d83e4b27abc000bd992ef /fs/proc | |
parent | ee2f51dc018e4dee06c6a6d52e821e27d701d650 (diff) |
procfs: clean up proc_reg_get_unmapped_area for 80-column limit
Clean up proc_reg_get_unmapped_area due to its 80-column limit
violation.
Signed-off-by: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Tested-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/inode.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 8eaa1ba793fc..28955d4b7218 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c | |||
@@ -285,19 +285,23 @@ static int proc_reg_mmap(struct file *file, struct vm_area_struct *vma) | |||
285 | return rv; | 285 | return rv; |
286 | } | 286 | } |
287 | 287 | ||
288 | static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags) | 288 | static unsigned long |
289 | proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, | ||
290 | unsigned long len, unsigned long pgoff, | ||
291 | unsigned long flags) | ||
289 | { | 292 | { |
290 | struct proc_dir_entry *pde = PDE(file_inode(file)); | 293 | struct proc_dir_entry *pde = PDE(file_inode(file)); |
291 | unsigned long rv = -EIO; | 294 | unsigned long rv = -EIO; |
292 | unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) = NULL; | 295 | unsigned long (*get_area)(struct file *, unsigned long, unsigned long, |
296 | unsigned long, unsigned long) = NULL; | ||
293 | if (use_pde(pde)) { | 297 | if (use_pde(pde)) { |
294 | #ifdef CONFIG_MMU | 298 | #ifdef CONFIG_MMU |
295 | get_unmapped_area = current->mm->get_unmapped_area; | 299 | get_area = current->mm->get_unmapped_area; |
296 | #endif | 300 | #endif |
297 | if (pde->proc_fops->get_unmapped_area) | 301 | if (pde->proc_fops->get_unmapped_area) |
298 | get_unmapped_area = pde->proc_fops->get_unmapped_area; | 302 | get_area = pde->proc_fops->get_unmapped_area; |
299 | if (get_unmapped_area) | 303 | if (get_area) |
300 | rv = get_unmapped_area(file, orig_addr, len, pgoff, flags); | 304 | rv = get_area(file, orig_addr, len, pgoff, flags); |
301 | unuse_pde(pde); | 305 | unuse_pde(pde); |
302 | } | 306 | } |
303 | return rv; | 307 | return rv; |