git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
jfs
/
jfs_metapage.c
diff --git
a/fs/jfs/jfs_metapage.c
b/fs/jfs/jfs_metapage.c
index
2b220dd
..
f5afc12
100644
(file)
--- a/
fs/jfs/jfs_metapage.c
+++ b/
fs/jfs/jfs_metapage.c
@@
-257,7
+257,7
@@
static sector_t metapage_get_blocks(struct inode *inode, sector_t lblock,
int rc = 0;
int xflag;
s64 xaddr;
int rc = 0;
int xflag;
s64 xaddr;
- sector_t file_blocks = (inode->i_size + inode->i_
bl
ksize - 1) >>
+ sector_t file_blocks = (inode->i_size + inode->i_
sb->s_bloc
ksize - 1) >>
inode->i_blkbits;
if (lblock >= file_blocks)
inode->i_blkbits;
if (lblock >= file_blocks)
@@
-577,7
+577,7
@@
static void metapage_invalidatepage(struct page *page, unsigned long offset)
metapage_releasepage(page, 0);
}
metapage_releasepage(page, 0);
}
-struct address_space_operations jfs_metapage_aops = {
+
const
struct address_space_operations jfs_metapage_aops = {
.readpage = metapage_readpage,
.writepage = metapage_writepage,
.sync_page = block_sync_page,
.readpage = metapage_readpage,
.writepage = metapage_writepage,
.sync_page = block_sync_page,
@@
-632,10
+632,9
@@
struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
}
SetPageUptodate(page);
} else {
}
SetPageUptodate(page);
} else {
- page = read_cache_page(mapping, page_index,
- (filler_t *)mapping->a_ops->readpage, NULL);
+ page = read_mapping_page(mapping, page_index, NULL);
if (IS_ERR(page) || !PageUptodate(page)) {
if (IS_ERR(page) || !PageUptodate(page)) {
- jfs_err("read_
cache
_page failed!");
+ jfs_err("read_
mapping
_page failed!");
return NULL;
}
lock_page(page);
return NULL;
}
lock_page(page);