Commit 077bf22b authored Sep 11, 2013 by Oleg Nesterov Committed by Linus Torvalds Sep 11, 2013

mm: do_mmap_pgoff: cleanup the usage of file_inode()



Simple cleanup.  Move "struct inode *inode" variable into "if (file)"
block to simplify the code and avoid the unnecessary check.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Colin Cross <ccross@android.com>
Cc: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent b2c56e4f

mm/mmap.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1202,7 +1202,6 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
		unsigned long *populate)
		{
		struct mm_struct * mm = current->mm;
		struct inode *inode;
		vm_flags_t vm_flags;

		*populate = 0;
		@@ -1265,9 +1264,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
		return -EAGAIN;
		}

		inode = file ? file_inode(file) : NULL;

		if (file) {
		struct inode *inode = file_inode(file);

		switch (flags & MAP_TYPE) {
		case MAP_SHARED:
		if ((prot&PROT_WRITE) && !(file->f_mode&FMODE_WRITE))