From: Dave Kleikamp <shaggy@austin.ibm.com>
Date: Thu, 14 Jul 2005 20:15:39 +0000 (-0500)
Subject: JFS: Remove bogus WARN_ON statement and some dead code
X-Git-Tag: v2.6.13-rc4~25^2~4^2~6
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=00be3e7e5cc3ca80e035b387e883d5ec10d7b897;p=linux-2.6-omap-h63xx.git

JFS: Remove bogus WARN_ON statement and some dead code

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
---

diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 6c5485d16c3..8cb803b54bc 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -561,7 +561,6 @@ static int metapage_releasepage(struct page *page, int gfp_mask)
 			dump_mem("page", page, sizeof(struct page));
 			dump_stack();
 		}
-		WARN_ON(mp->lsn);
 		if (mp->lsn)
 			remove_from_logsync(mp);
 		remove_metapage(page, mp);
@@ -783,14 +782,6 @@ void release_metapage(struct metapage * mp)
 	if (test_bit(META_discard, &mp->flag) && !mp->count) {
 		clear_page_dirty(page);
 		ClearPageUptodate(page);
-#ifdef _NOT_YET
-		if (page->mapping) {
-		/* Remove from page cache and page cache reference */
-			remove_from_page_cache(page);
-			page_cache_release(page);
-			metapage_releasepage(page, 0);
-		}
-#endif
 	}
 #else
 	/* Try to keep metapages from using up too much memory */