The patch titled
Subject: mm-fix-races-between-swapoff-and-flush-dcache-fix
has been removed from the -mm tree. Its filename was
mm-fix-races-between-swapoff-and-flush-dcache-fix.patch
This patch was dropped because it was folded into mm-fix-races-between-swapoff-and-flush-dcache.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-fix-races-between-swapoff-and-flush-dcache-fix
simplify page_mapping_file(), per Mike
Cc: "Huang, Ying" <ying.huang@xxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/util.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff -puN mm/util.c~mm-fix-races-between-swapoff-and-flush-dcache-fix mm/util.c
--- a/mm/util.c~mm-fix-races-between-swapoff-and-flush-dcache-fix
+++ a/mm/util.c
@@ -522,8 +522,7 @@ struct address_space *page_mapping_file(
{
if (unlikely(PageSwapCache(page)))
return NULL;
- else
- return page_mapping(page);
+ return page_mapping(page);
}
/* Slow path of page_mapcount() for compound pages */
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-fix-races-between-swapoff-and-flush-dcache.patch
headers-untangle-kmemleakh-from-mmh-fix.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
