- unevictable-lru-infrastructure-remove-redundant-page-mapping-check.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     unevictable-lru-infrastructure: remove redundant page->mapping check
has been removed from the -mm tree.  Its filename was
     unevictable-lru-infrastructure-remove-redundant-page-mapping-check.patch

This patch was dropped because it was folded into unevictable-lru-infrastructure.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: unevictable-lru-infrastructure: remove redundant page->mapping check
From: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>

Remove redundant mapping check.

We'd be doing exactly what putback_lru_page() is doing.  So, this code as
always unnecessary, duplicate code.  So, just let putback_lru_page()
handle this condition and conditionally unlock_page().

Signed-off-by: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Acked-by: Lee Schermerhorn <Lee.Schermerhorn@xxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/migrate.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff -puN mm/migrate.c~unevictable-lru-infrastructure-remove-redundant-page-mapping-check mm/migrate.c
--- a/mm/migrate.c~unevictable-lru-infrastructure-remove-redundant-page-mapping-check
+++ a/mm/migrate.c
@@ -713,13 +713,7 @@ unlock:
  		 * restored.
  		 */
  		list_del(&page->lru);
-		if (!page->mapping) {
-			VM_BUG_ON(page_count(page) != 1);
-			unlock_page(page);
-			put_page(page);		/* just free the old page */
-			goto end_migration;
-		} else
-			unlock = putback_lru_page(page);
+		unlock = putback_lru_page(page);
 	}
 
 	if (unlock)
_

Patches currently in -mm which might be from nishimura@xxxxxxxxxxxxxxxxx are

origin.patch
unevictable-lru-infrastructure.patch
unevictable-lru-infrastructure-remove-redundant-page-mapping-check.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux