patch-2.2.14 linux/fs/isofs/inode.c

• Lines: 19
• Date: Tue Jan 4 10:12:23 2000
• Orig file: v2.2.13/linux/fs/isofs/inode.c
• Orig date: Tue Jan 4 11:10:40 2000

diff -u --recursive --new-file v2.2.13/linux/fs/isofs/inode.c linux/fs/isofs/inode.c
@@ -954,7 +954,7 @@
 	printk("isofs_bmap: mapped inode:block %x:%d to block %lu\n",
 		inode->i_ino, block, (b_off - offset + firstext) >> ISOFS_BUFFER_BITS(inode));
 #endif
-	return (b_off - offset + firstext) >> ISOFS_BUFFER_BITS(inode);
+	return firstext + ((b_off - offset) >> ISOFS_BUFFER_BITS(inode));
 }
 
 
@@ -1162,8 +1162,7 @@
 	  iso_date(raw_inode->date, high_sierra);
 
 	inode->u.isofs_i.i_first_extent = (isonum_733 (raw_inode->extent) +
-					   isonum_711 (raw_inode->ext_attr_length))
-	  << inode -> i_sb -> u.isofs_sb.s_log_zone_size;
+					   isonum_711 (raw_inode->ext_attr_length));
 
 /* Now test for possible Rock Ridge extensions which will override some of
    these numbers in the inode structure. */