summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2004-08-28 06:41:22 -0500
committerDave Kleikamp <shaggy@austin.ibm.com>2004-08-28 06:41:22 -0500
commitef1995873f144bd50b013c6b4dbe0ccbfab756d3 (patch)
tree3c959a932386ab32381ea2302df064d0682713e7 /fs
parent8246d532a155932e323887bffcdbd8479761456c (diff)
parentfcc1fcc376bb1fe8ed7609b07931fc5bd774943a (diff)
Merge jfs@jfs.bkbits.net:linux-2.5
into austin.ibm.com:/shaggy/bk/jfs-2.5
Diffstat (limited to 'fs')
-rw-r--r--fs/jfs/jfs_metapage.c1
-rw-r--r--fs/jfs/jfs_mount.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 831ee09c2b9b..82ffeaadf6e9 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -557,6 +557,7 @@ again:
if (page) {
block_invalidatepage(page, 0);
unlock_page(page);
+ page_cache_release(page);
}
}
}
diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c
index fad757e9ea53..aa871829b761 100644
--- a/fs/jfs/jfs_mount.c
+++ b/fs/jfs/jfs_mount.c
@@ -197,9 +197,6 @@ int jfs_mount(struct super_block *sb)
/*
* unwind on error
*/
-//errout42: /* close fileset inode allocation map */
- diUnmount(ipimap, 1);
-
errout41: /* close fileset inode allocation map inode */
diFreeSpecial(ipimap);