Groups > linux.kernel > #1200256

[PATCH 02/11] thp: Change insert_pfn's return type to void

Path	csiph.com!optima2.xanadu-bbs.net!xanadu-bbs.net!feeder.erje.net!us.feeder.erje.net!news2.arglkargh.de!news.ecp.fr!aioe.org!bofh.it!news.nic.it!robomod
From	Matthew Wilcox <matthew.r.wilcox@intel.com>
Newsgroups	linux.kernel
Subject	[PATCH 02/11] thp: Change insert_pfn's return type to void
Date	Tue, 04 Aug 2015 22:00:03 +0200
Message-ID	<pTQxt-3Do-33@gated-at.bofh.it> (permalink)
References	<pTQxs-3Do-21@gated-at.bofh.it>
X-Original-To	Andrew Morton <akpm@linux-foundation.org>, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org
X-Extloop1	1
X-Ironport-Av	E=Sophos;i="5.15,611,1432623600"; d="scan'208";a="536009999"
X-Mailer	git-send-email 2.4.6
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	50
Organization	linux.* mail to news gateway
X-Original-Cc	Matthew Wilcox <willy@linux.intel.com>
X-Original-Date	Tue, 4 Aug 2015 15:57:56 -0400
X-Original-Message-ID	<1438718285-21168-3-git-send-email-matthew.r.wilcox@intel.com>
X-Original-References	<1438718285-21168-1-git-send-email-matthew.r.wilcox@intel.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1200256

Show key headers only | View raw

From: Matthew Wilcox <willy@linux.intel.com>

It would make more sense to have all the return values from
vmf_insert_pfn_pmd() encoded in one place instead of having to follow
the convention into insert_pfn().  Suggested by Jeff Moyer.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
---
 mm/huge_memory.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 26d0fc1..5ffdcaa 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -837,7 +837,7 @@ int do_huge_pmd_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	return 0;
 }
 
-static int insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr,
+static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr,
 		pmd_t *pmd, unsigned long pfn, pgprot_t prot, bool write)
 {
 	struct mm_struct *mm = vma->vm_mm;
@@ -855,7 +855,6 @@ static int insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr,
 		update_mmu_cache_pmd(vma, addr, pmd);
 	}
 	spin_unlock(ptl);
-	return VM_FAULT_NOPAGE;
 }
 
 int vmf_insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr,
@@ -877,7 +876,8 @@ int vmf_insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr,
 		return VM_FAULT_SIGBUS;
 	if (track_pfn_insert(vma, &pgprot, pfn))
 		return VM_FAULT_SIGBUS;
-	return insert_pfn_pmd(vma, addr, pmd, pfn, pgprot, write);
+	insert_pfn_pmd(vma, addr, pmd, pfn, pgprot, write);
+	return VM_FAULT_NOPAGE;
 }
 
 int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,
-- 
2.1.4

--
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/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 02/11] thp: Change insert_pfn's return type to void Matthew Wilcox <matthew.r.wilcox@intel.com> - 2015-08-04 22:00 +0200

csiph-web