diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:50 -0400 |
| commit | de745fb27983770ebfdeaa70f8a36f791fb33786 (patch) | |
| tree | 701555a1a7a2a5ff9a6c67896cf1ea089597750e /fs/jfs/jfs_metapage.c | |
| parent | 08cd84c81f27d5bd22ba958b7cae6d566c509280 (diff) | |
| parent | a670fcb43f01a67ef56176afc76e5d43d128b25c (diff) | |
| download | blackbird-op-linux-de745fb27983770ebfdeaa70f8a36f791fb33786.tar.gz blackbird-op-linux-de745fb27983770ebfdeaa70f8a36f791fb33786.zip | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'fs/jfs/jfs_metapage.c')
| -rw-r--r-- | fs/jfs/jfs_metapage.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c index 6c5485d16c39..13d7e3f1feb4 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); @@ -641,7 +640,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock, } else { page = read_cache_page(mapping, page_index, (filler_t *)mapping->a_ops->readpage, NULL); - if (IS_ERR(page)) { + if (IS_ERR(page) || !PageUptodate(page)) { jfs_err("read_cache_page failed!"); return NULL; } @@ -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 */ |
