From b3b2f01e8c3b04f9fb01a19b160c5de10a7f18a0 Mon Sep 17 00:00:00 2001
From: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Wed, 20 Dec 2006 15:55:35 -0600
Subject: [PATCH] --- yaml --- r: 44859 b: refs/heads/master c:
 d0e671a932cb9c653b27393cec26aec012a8d97e h: refs/heads/master i:   44857:
 1d8f65aa3049d703e83d8cb68527d04885deb71e   44855:
 c3101fda3b1616c6e664d2a23f59c68c81a4baf3 v: v3

---
 [refs]                      |  2 +-
 trunk/fs/jfs/jfs_metapage.c | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 15c571e997c1..d1fe1dfdb580 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fba2591bf4e418b6c3f9f8794c9dd8fe40ae7bd9
+refs/heads/master: d0e671a932cb9c653b27393cec26aec012a8d97e
diff --git a/trunk/fs/jfs/jfs_metapage.c b/trunk/fs/jfs/jfs_metapage.c
index b1a1c7296014..ceaf03b94935 100644
--- a/trunk/fs/jfs/jfs_metapage.c
+++ b/trunk/fs/jfs/jfs_metapage.c
@@ -764,22 +764,9 @@ void release_metapage(struct metapage * mp)
 	} else if (mp->lsn)	/* discard_metapage doesn't remove it */
 		remove_from_logsync(mp);
 
-#if MPS_PER_PAGE == 1
-	/*
-	 * If we know this is the only thing in the page, we can throw
-	 * the page out of the page cache.  If pages are larger, we
-	 * don't want to do this.
-	 */
-
-	/* Retest mp->count since we may have released page lock */
-	if (test_bit(META_discard, &mp->flag) && !mp->count) {
-		clear_page_dirty(page);
-		ClearPageUptodate(page);
-	}
-#else
 	/* Try to keep metapages from using up too much memory */
 	drop_metapage(page, mp);
-#endif
+
 	unlock_page(page);
 	page_cache_release(page);
 }