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
vserver 1.9.3
[linux-2.6.git]
/
fs
/
isofs
/
compress.c
diff --git
a/fs/isofs/compress.c
b/fs/isofs/compress.c
index
8877508
..
0b5a3a0
100644
(file)
--- a/
fs/isofs/compress.c
+++ b/
fs/isofs/compress.c
@@
-114,7
+114,7
@@
static int zisofs_readpage(struct file *file, struct page *page)
blockendptr = blockptr + 4;
indexblocks = ((blockptr^blockendptr) >> bufshift) ? 2 : 1;
blockendptr = blockptr + 4;
indexblocks = ((blockptr^blockendptr) >> bufshift) ? 2 : 1;
- ptrbh[0] = ptrbh[1] =
0
;
+ ptrbh[0] = ptrbh[1] =
NULL
;
if ( isofs_get_blocks(inode, blockptr >> bufshift, ptrbh, indexblocks) != indexblocks ) {
if ( ptrbh[0] ) brelse(ptrbh[0]);
if ( isofs_get_blocks(inode, blockptr >> bufshift, ptrbh, indexblocks) != indexblocks ) {
if ( ptrbh[0] ) brelse(ptrbh[0]);
@@
-132,7
+132,7
@@
static int zisofs_readpage(struct file *file, struct page *page)
brelse(ptrbh[1]);
goto eio;
}
brelse(ptrbh[1]);
goto eio;
}
- cstart = le32_to_cpu(*(
u
32 *)(bh->b_data + (blockptr & bufmask)));
+ cstart = le32_to_cpu(*(
__le
32 *)(bh->b_data + (blockptr & bufmask)));
if ( indexblocks == 2 ) {
/* We just crossed a block boundary. Switch to the next block */
if ( indexblocks == 2 ) {
/* We just crossed a block boundary. Switch to the next block */
@@
-144,7
+144,7
@@
static int zisofs_readpage(struct file *file, struct page *page)
goto eio;
}
}
goto eio;
}
}
- cend = le32_to_cpu(*(
u
32 *)(bh->b_data + (blockendptr & bufmask)));
+ cend = le32_to_cpu(*(
__le
32 *)(bh->b_data + (blockendptr & bufmask)));
brelse(bh);
csize = cend-cstart;
brelse(bh);
csize = cend-cstart;