#include <linux/string.h>
#include <linux/slab.h>
#include <linux/errno.h>
-#include <linux/cdrom.h>
#include <linux/init.h>
#include <linux/nls.h>
#include <linux/ctype.h>
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]);
brelse(ptrbh[1]);
goto eio;
}
- cstart = le32_to_cpu(*(u32 *)(bh->b_data + (blockptr & bufmask)));
+ cstart = le32_to_cpu(*(__le32 *)(bh->b_data + (blockptr & bufmask)));
if ( indexblocks == 2 ) {
/* We just crossed a block boundary. Switch to the next block */
goto eio;
}
}
- cend = le32_to_cpu(*(u32 *)(bh->b_data + (blockendptr & bufmask)));
+ cend = le32_to_cpu(*(__le32 *)(bh->b_data + (blockendptr & bufmask)));
brelse(bh);
csize = cend-cstart;