[PATCH] perthread_pages_alloc cleanup

[Martin Hicks]

Hi Andrew,

This is just a cleanup - no functional changes.  Gets a bunch of code
outside an if by returning NULL earlier.

-- 
Martin Hicks                Wild Open Source Inc.
mort@xxxxxxxxxxxxxxxxxx     613-266-2296


Signed-Off-By: Martin Hicks <mort@xxxxxxxxxxxxxxxxxx>


Index: linux-2.6.10/mm/page_alloc.c
===================================================================
--- linux-2.6.10.orig/mm/page_alloc.c	2005-02-25 08:02:33.000000000 -0800
+++ linux-2.6.10/mm/page_alloc.c	2005-02-28 07:08:01.000000000 -0800
@@ -710,6 +710,7 @@
 perthread_pages_alloc(void)
 {
 	struct list_head *perthread_pages;
+	struct page *page;
 
 	/*
 	 * try to allocate pages from the per-thread private_pages pool. No
@@ -717,18 +718,16 @@
 	 * itself, and not by interrupts or other threads.
 	 */
 	perthread_pages = get_per_thread_pages();
-	if (!in_interrupt() && !list_empty(perthread_pages)) {
-		struct page *page;
-
-		page = list_entry(perthread_pages->next, struct page, lru);
-		list_del(&page->lru);
-		current->private_pages_count--;
-		/*
-		 * per-thread page is already initialized, just return it.
-		 */
-		return page;
-	} else
+	if (in_interrupt() || list_empty(perthread_pages))
 		return NULL;
+
+	page = list_entry(perthread_pages->next, struct page, lru);
+	list_del(&page->lru);
+	current->private_pages_count--;
+	/*
+	 * per-thread page is already initialized, just return it.
+	 */
+	return page;
 }
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/