Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5721cf84 authored by HATAYAMA Daisuke's avatar HATAYAMA Daisuke Committed by Linus Torvalds
Browse files

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: default avatarHATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Tested-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ee2f51dc

fs/proc/inode.c

+10 −6
Original line number Diff line number Diff line
@@ -285,19 +285,23 @@ static int proc_reg_mmap(struct file *file, struct vm_area_struct *vma) 
	return rv;

}



static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags)

static unsigned long

proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr,

			   unsigned long len, unsigned long pgoff,

			   unsigned long flags)

{

	struct proc_dir_entry *pde = PDE(file_inode(file));

	unsigned long rv = -EIO;

	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) = NULL;

	unsigned long (*get_area)(struct file *, unsigned long, unsigned long,

				  unsigned long, unsigned long) = NULL;

	if (use_pde(pde)) {

#ifdef CONFIG_MMU

		get_unmapped_area = current->mm->get_unmapped_area;

		get_area = current->mm->get_unmapped_area;

#endif

		if (pde->proc_fops->get_unmapped_area)

			get_unmapped_area = pde->proc_fops->get_unmapped_area;

		if (get_unmapped_area)

			rv = get_unmapped_area(file, orig_addr, len, pgoff, flags);

			get_area = pde->proc_fops->get_unmapped_area;

		if (get_area)

			rv = get_area(file, orig_addr, len, pgoff, flags);

		unuse_pde(pde);

	}

	return rv;