From 694b771b00841829928168b1e112cc5ea5f24261 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Tue, 31 Mar 2009 15:23:33 -0700
Subject: [PATCH] --- yaml --- r: 139168 b: refs/heads/master c:
 9fab5619bdd7f84cdd22cc760778f759f9819a33 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/swap.h | 5 +++++
 trunk/mm/shmem.c           | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2f7c5c86ecda..414a24bc35df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 327c0e968645f2601a43f5ea7c19c7b3a5fa0a34
+refs/heads/master: 9fab5619bdd7f84cdd22cc760778f759f9819a33
diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h
index b8b0c4ce83e6..62d81435347a 100644
--- a/trunk/include/linux/swap.h
+++ b/trunk/include/linux/swap.h
@@ -382,6 +382,11 @@ static inline struct page *swapin_readahead(swp_entry_t swp, gfp_t gfp_mask,
 	return NULL;
 }
 
+static inline int swap_writepage(struct page *p, struct writeback_control *wbc)
+{
+	return 0;
+}
+
 static inline struct page *lookup_swap_cache(swp_entry_t swp)
 {
 	return NULL;
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index 7ec78e24a30d..d94d2e9146bc 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -1068,8 +1068,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
 		swap_duplicate(swap);
 		BUG_ON(page_mapped(page));
 		page_cache_release(page);	/* pagecache ref */
-		set_page_dirty(page);
-		unlock_page(page);
+		swap_writepage(page, wbc);
 		if (inode) {
 			mutex_lock(&shmem_swaplist_mutex);
 			/* move instead of add in case we're racing */