[PATCH] (1/4) 2.5.5-pre1 fixes

hfs compile fixes

fs/hfs/file.c

@@ -293,7 +293,6 @@ static inline int xlate_from_user(char *data, const char *buf, int count)
 hfs_s32 hfs_do_read(struct inode *inode, struct hfs_fork * fork, hfs_u32 pos,
 		    char * buf, hfs_u32 count)
 {
-	kdev_t dev = inode->i_dev;
 	hfs_s32 size, chars, offset, block, blocks, read = 0;
 	int bhrequest, uptodate;
 	int convert = HFS_I(inode)->convert;

fs/hfs/file_hdr.c

@@ -592,8 +592,7 @@ static hfs_rwret_t hdr_read(struct file * filp, char * buf,
 		if (p) {
 			left -= copy_to_user(buf, p + offset, left);
 		} else if (fork) {
-			left = hfs_do_read(inode, fork, offset, buf, left,
-					   filp->f_reada != 0);
+			left = hfs_do_read(inode, fork, offset, buf, left);
 			if (left > 0) {
 				filp->f_reada = 1;
 			} else if (!read) {

include/linux/hfs_fs.h

@@ -267,7 +267,7 @@ extern void hfs_nat_drop_dentry(struct dentry *, const ino_t);
 
 /* file.c */
 extern hfs_s32 hfs_do_read(struct inode *, struct hfs_fork *, hfs_u32,
-			   char *, hfs_u32, int);
+			   char *, hfs_u32);
 extern hfs_s32 hfs_do_write(struct inode *, struct hfs_fork *, hfs_u32,
 			    const char *, hfs_u32);
 extern void hfs_file_fix_mode(struct hfs_cat_entry *entry);