Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932108AbbKQR1V (ORCPT ); Tue, 17 Nov 2015 12:27:21 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33539 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754048AbbKQR06 (ORCPT ); Tue, 17 Nov 2015 12:26:58 -0500 From: Piotr Kwapulinski To: mhocko@suse.com Cc: oleg@redhat.com, akpm@linux-foundation.org, cmetcalf@ezchip.com, mszeredi@suse.cz, viro@zeniv.linux.org.uk, dave@stgolabs.net, kirill.shutemov@linux.intel.com, n-horiguchi@ah.jp.nec.com, aarcange@redhat.com, iamjoonsoo.kim@lge.com, jack@suse.cz, xiexiuqi@huawei.com, vbabka@suse.cz, Vineet.Gupta1@synopsys.com, riel@redhat.com, gang.chen.5i5j@gmail.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Piotr Kwapulinski Subject: [PATCH] mm/mmap.c: remove incorrect MAP_FIXED flag comparison from mmap_region Date: Tue, 17 Nov 2015 18:26:38 +0100 Message-Id: <1447781198-5496-1-git-send-email-kwapulinski.piotr@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <20151117161928.GA9611@redhat.com> References: <20151117161928.GA9611@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1271 Lines: 39 The following flag comparison in mmap_region is not fully correct: if (!(vm_flags & MAP_FIXED)) The vm_flags should not be compared with MAP_FIXED (0x10). It is a bit confusing. This condition is almost always true since VM_MAYREAD (0x10) flag is almost always set by default. This patch removes this condition. Signed-off-by: Piotr Kwapulinski --- mm/mmap.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 2ce04a6..02422ea 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1547,13 +1547,6 @@ unsigned long mmap_region(struct file *file, unsigned long addr, if (!may_expand_vm(mm, len >> PAGE_SHIFT)) { unsigned long nr_pages; - /* - * MAP_FIXED may remove pages of mappings that intersects with - * requested mapping. Account for the pages it would unmap. - */ - if (!(vm_flags & MAP_FIXED)) - return -ENOMEM; - nr_pages = count_vma_pages_range(mm, addr, addr + len); if (!may_expand_vm(mm, (len >> PAGE_SHIFT) - nr_pages)) -- 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/