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
/
inode.c
diff --git
a/fs/jfs/inode.c
b/fs/jfs/inode.c
index
11d65d9
..
f8a1714
100644
(file)
--- a/
fs/jfs/inode.c
+++ b/
fs/jfs/inode.c
@@
-170,16
+170,15
@@
void jfs_dirty_inode(struct inode *inode)
set_cflag(COMMIT_Dirty, inode);
}
set_cflag(COMMIT_Dirty, inode);
}
-static int
-jfs_get_blocks(struct inode *ip, sector_t lblock, unsigned long max_blocks,
- struct buffer_head *bh_result, int create)
+int jfs_get_block(struct inode *ip, sector_t lblock,
+ struct buffer_head *bh_result, int create)
{
s64 lblock64 = lblock;
int rc = 0;
xad_t xad;
s64 xaddr;
int xflag;
{
s64 lblock64 = lblock;
int rc = 0;
xad_t xad;
s64 xaddr;
int xflag;
- s32 xlen =
max_block
s;
+ s32 xlen =
bh_result->b_size >> ip->i_blkbit
s;
/*
* Take appropriate lock on inode
/*
* Take appropriate lock on inode
@@
-190,7
+189,7
@@
jfs_get_blocks(struct inode *ip, sector_t lblock, unsigned long max_blocks,
IREAD_LOCK(ip);
if (((lblock64 << ip->i_sb->s_blocksize_bits) < ip->i_size) &&
IREAD_LOCK(ip);
if (((lblock64 << ip->i_sb->s_blocksize_bits) < ip->i_size) &&
- (!xtLookup(ip, lblock64,
max_blocks
, &xflag, &xaddr, &xlen, 0)) &&
+ (!xtLookup(ip, lblock64,
xlen
, &xflag, &xaddr, &xlen, 0)) &&
xaddr) {
if (xflag & XAD_NOTRECORDED) {
if (!create)
xaddr) {
if (xflag & XAD_NOTRECORDED) {
if (!create)
@@
-257,13
+256,6
@@
jfs_get_blocks(struct inode *ip, sector_t lblock, unsigned long max_blocks,
return rc;
}
return rc;
}
-static int jfs_get_block(struct inode *ip, sector_t lblock,
- struct buffer_head *bh_result, int create)
-{
- return jfs_get_blocks(ip, lblock, bh_result->b_size >> ip->i_blkbits,
- bh_result, create);
-}
-
static int jfs_writepage(struct page *page, struct writeback_control *wbc)
{
return nobh_writepage(page, jfs_get_block, wbc);
static int jfs_writepage(struct page *page, struct writeback_control *wbc)
{
return nobh_writepage(page, jfs_get_block, wbc);
@@
-307,7
+299,7
@@
static ssize_t jfs_direct_IO(int rw, struct kiocb *iocb,
offset, nr_segs, jfs_get_block, NULL);
}
offset, nr_segs, jfs_get_block, NULL);
}
-struct address_space_operations jfs_aops = {
+
const
struct address_space_operations jfs_aops = {
.readpage = jfs_readpage,
.readpages = jfs_readpages,
.writepage = jfs_writepage,
.readpage = jfs_readpage,
.readpages = jfs_readpages,
.writepage = jfs_writepage,